From cd581c9e81b6a1c92b527c059df07d59ecd6c2eb Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 6 May 2016 13:45:46 -0400
Subject: [PATCH] Simplify our templates

This is applying the new property name simplification.
---
 gtk/ui/gtkaboutdialog.ui          |  44 +--
 gtk/ui/gtkappchooserdialog.ui     |  24 +-
 gtk/ui/gtkappchooserwidget.ui     |  20 +-
 gtk/ui/gtkassistant.ui            |  72 ++---
 gtk/ui/gtkcolorchooserdialog.ui   |  12 +-
 gtk/ui/gtkcoloreditor.ui          | 166 +++++-----
 gtk/ui/gtkcombobox.ui             |   6 +-
 gtk/ui/gtkdialog.ui               |  11 +-
 gtk/ui/gtkfilechooserbutton.ui    |  12 +-
 gtk/ui/gtkfilechooserdialog.ui    |  11 +-
 gtk/ui/gtkfilechooserwidget.ui    |  64 ++--
 gtk/ui/gtkfontbutton.ui           |   6 +-
 gtk/ui/gtkfontchooserdialog.ui    |  12 +-
 gtk/ui/gtkfontchooserwidget.ui    |  98 +++---
 gtk/ui/gtkinfobar.ui              |  14 +-
 gtk/ui/gtklockbutton.ui           |   6 +-
 gtk/ui/gtkmessagedialog.ui        |  11 +-
 gtk/ui/gtkpagesetupunixdialog.ui  |  96 +++---
 gtk/ui/gtkpathbar.ui              |  12 +-
 gtk/ui/gtkplacesview.ui           | 212 ++++++-------
 gtk/ui/gtkplacesviewrow.ui        |  25 +-
 gtk/ui/gtkprintunixdialog.ui      | 511 +++++++++++++++---------------
 gtk/ui/gtkrecentchooserdefault.ui |  26 +-
 gtk/ui/gtkscalebutton.ui          |  28 +-
 gtk/ui/gtksearchbar.ui            |  12 +-
 gtk/ui/gtksidebarrow.ui           |   4 +-
 gtk/ui/gtkstatusbar.ui            |  12 +-
 gtk/ui/gtktooltipwindow.ui        |  19 +-
 gtk/ui/gtkvolumebutton.ui         |  12 +-
 29 files changed, 760 insertions(+), 798 deletions(-)

diff --git a/gtk/ui/gtkaboutdialog.ui b/gtk/ui/gtkaboutdialog.ui
index c919bb6da4..9dca96d3c7 100644
--- a/gtk/ui/gtkaboutdialog.ui
+++ b/gtk/ui/gtkaboutdialog.ui
@@ -3,12 +3,12 @@
   <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkImage" id="image1">
     <property name="visible">1</property>
-    <property name="icon_name">help-about</property>
+    <property name="icon-name">help-about</property>
   </object>
   <template class="GtkAboutDialog" parent="GtkDialog">
-    <property name="border_width">5</property>
+    <property name="border-width">5</property>
     <property name="resizable">0</property>
-    <property name="type_hint">dialog</property>
+    <property name="type-hint">dialog</property>
     <child internal-child="headerbar">
       <object class="GtkHeaderBar" id="headerbar1">
         <property name="visible">1</property>
@@ -28,13 +28,13 @@
         <child>
           <object class="GtkBox" id="box">
             <property name="visible">1</property>
-            <property name="border_width">5</property>
+            <property name="border-width">5</property>
             <property name="orientation">vertical</property>
             <property name="spacing">12</property>
             <child>
               <object class="GtkImage" id="logo_image">
                 <property name="visible">1</property>
-                <property name="icon_name">image-missing</property>
+                <property name="icon-name">image-missing</property>
               </object>
               <packing>
                 <property name="fill">0</property>
@@ -54,8 +54,8 @@
             </child>
             <child>
               <object class="GtkStack" id="stack">
-                <property name="width_request">400</property>
-                <property name="height_request">100</property>
+                <property name="width-request">400</property>
+                <property name="height-request">100</property>
                 <property name="visible">1</property>
                 <property name="transition-type">over-up-down</property>
                 <property name="transition-duration">600</property>
@@ -96,7 +96,7 @@
                         <property name="homogeneous">1</property>
                         <child>
                           <object class="GtkLabel" id="website_label">
-                            <property name="no_show_all">1</property>
+                            <property name="no-show-all">1</property>
                             <property name="label">http://website.com</property>
                             <property name="selectable">1</property>
                             <signal name="activate-link" handler="emit_activate_link" object="GtkAboutDialog" swapped="yes"/>
@@ -114,16 +114,16 @@
                     <child>
                       <object class="GtkLabel" id="license_label">
                         <property name="label">license</property>
-                        <property name="use_markup">1</property>
+                        <property name="use-markup">1</property>
                         <property name="justify">center</property>
                         <property name="wrap">1</property>
                         <property name="selectable">1</property>
-                        <property name="no_show_all">1</property>
+                        <property name="no-show-all">1</property>
                         <property name="max-width-chars">60</property>
                       </object>
                       <packing>
                         <property name="fill">0</property>
-                        <property name="pack_type">end</property>
+                        <property name="pack-type">end</property>
                         <property name="position">3</property>
                       </packing>
                     </child>
@@ -138,7 +138,7 @@
                       </object>
                       <packing>
                         <property name="fill">0</property>
-                        <property name="pack_type">end</property>
+                        <property name="pack-type">end</property>
                         <property name="position">4</property>
                       </packing>
                     </child>
@@ -156,8 +156,8 @@
                     <child>
                       <object class="GtkScrolledWindow" id="scrolledwindow1">
                         <property name="visible">1</property>
-                        <property name="hscrollbar_policy">never</property>
-                        <property name="shadow_type">in</property>
+                        <property name="hscrollbar-policy">never</property>
+                        <property name="shadow-type">in</property>
                         <child>
                           <object class="GtkViewport" id="viewport1">
                             <property name="visible">1</property>
@@ -169,10 +169,10 @@
                                 <property name="visible">1</property>
                                 <property name="halign">center</property>
                                 <property name="valign">start</property>
-                                <property name="border_width">5</property>
+                                <property name="border-width">5</property>
                                 <property name="orientation">vertical</property>
-                                <property name="row_spacing">2</property>
-                                <property name="column_spacing">8</property>
+                                <property name="row-spacing">2</property>
+                                <property name="column-spacing">8</property>
                               </object>
                             </child>
                           </object>
@@ -196,15 +196,15 @@
                     <child>
                       <object class="GtkScrolledWindow" id="scrolledwindow2">
                         <property name="visible">1</property>
-                        <property name="hscrollbar_policy">never</property>
-                        <property name="shadow_type">in</property>
+                        <property name="hscrollbar-policy">never</property>
+                        <property name="shadow-type">in</property>
                         <child>
                           <object class="GtkTextView" id="license_view">
                             <property name="visible">1</property>
                             <property name="editable">0</property>
-                            <property name="left_margin">8</property>
-                            <property name="right_margin">8</property>
-                            <property name="cursor_visible">0</property>
+                            <property name="left-margin">8</property>
+                            <property name="right-margin">8</property>
+                            <property name="cursor-visible">0</property>
                             <signal name="event-after" handler="text_view_event_after" swapped="no"/>
                             <signal name="key-press-event" handler="text_view_key_press_event" swapped="no"/>
                             <signal name="motion-notify-event" handler="text_view_motion_notify_event" swapped="no"/>
diff --git a/gtk/ui/gtkappchooserdialog.ui b/gtk/ui/gtkappchooserdialog.ui
index 959ddab584..9acf41663f 100644
--- a/gtk/ui/gtkappchooserdialog.ui
+++ b/gtk/ui/gtkappchooserdialog.ui
@@ -3,7 +3,7 @@
   <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkAppChooserDialog" parent="GtkDialog">
     <property name="title" translatable="yes">Select Application</property>
-    <property name="type_hint">dialog</property>
+    <property name="type-hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="orientation">vertical</property>
@@ -22,10 +22,10 @@
         </child>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
-            <property name="layout_style">end</property>
+            <property name="layout-style">end</property>
           </object>
           <packing>
-            <property name="pack_type">end</property>
+            <property name="pack-type">end</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -57,7 +57,7 @@
     <child type="action">
       <object class="GtkButton" id="cancel_button">
         <property name="visible">1</property>
-        <property name="use_underline">1</property>
+        <property name="use-underline">1</property>
         <property name="label" translatable="yes">_Cancel</property>
       </object>
     </child>
@@ -65,8 +65,8 @@
       <object class="GtkButton" id="ok_button">
         <property name="visible">1</property>
         <property name="label" translatable="yes">_Select</property>
-        <property name="use_underline">1</property>
-        <property name="can_default">1</property>
+        <property name="use-underline">1</property>
+        <property name="can-default">1</property>
       </object>
     </child>
     <action-widgets>
@@ -77,17 +77,17 @@
   <object class="GtkButton" id="show_more_button">
     <property name="label" translatable="yes">_View All Applications</property>
     <property name="visible">1</property>
-    <property name="use_underline">1</property>
-    <property name="can_focus">1</property>
-    <property name="receives_default">1</property>
+    <property name="use-underline">1</property>
+    <property name="can-focus">1</property>
+    <property name="receives-default">1</property>
     <signal name="clicked" handler="show_more_button_clicked_cb" swapped="no"/>
   </object>
   <object class="GtkButton" id="software_button">
     <property name="label" translatable="yes">_Find New Applications</property>
     <property name="visible">1</property>
-    <property name="use_underline">1</property>
-    <property name="can_focus">1</property>
-    <property name="receives_default">1</property>
+    <property name="use-underline">1</property>
+    <property name="can-focus">1</property>
+    <property name="receives-default">1</property>
     <signal name="clicked" handler="software_button_clicked_cb" swapped="no"/>
   </object>
   <object class="GtkSizeGroup" id="buttons">
diff --git a/gtk/ui/gtkappchooserwidget.ui b/gtk/ui/gtkappchooserwidget.ui
index e290c021c3..6e158ec4d5 100644
--- a/gtk/ui/gtkappchooserwidget.ui
+++ b/gtk/ui/gtkappchooserwidget.ui
@@ -35,18 +35,18 @@
         <property name="visible">1</property>
         <child>
           <object class="GtkScrolledWindow" id="scrolled_window">
-            <property name="width_request">400</property>
-            <property name="height_request">300</property>
+            <property name="width-request">400</property>
+            <property name="height-request">300</property>
             <property name="visible">1</property>
-            <property name="can_focus">1</property>
-            <property name="hscrollbar_policy">never</property>
-            <property name="shadow_type">in</property>
+            <property name="can-focus">1</property>
+            <property name="hscrollbar-policy">never</property>
+            <property name="shadow-type">in</property>
             <child>
               <object class="GtkTreeView" id="program_list">
                 <property name="visible">1</property>
-                <property name="can_focus">1</property>
+                <property name="can-focus">1</property>
                 <property name="model">program_list_sort</property>
-                <property name="headers_visible">0</property>
+                <property name="headers-visible">0</property>
                 <signal name="button-press-event" handler="widget_button_press_event_cb" swapped="no"/>
                 <signal name="row-activated" handler="program_list_selection_activated" swapped="no"/>
                 <child internal-child="selection">
@@ -63,8 +63,8 @@
                     <child>
                       <object class="GtkCellRendererText" id="heading">
                         <property name="ypad">6</property>
-                        <property name="wrap_mode">word</property>
-                        <property name="wrap_width">350</property>
+                        <property name="wrap-mode">word</property>
+                        <property name="wrap-width">350</property>
                       </object>
                       <attributes>
                         <attribute name="visible">6</attribute>
@@ -97,7 +97,7 @@
         <child type="overlay">
           <object class="GtkBox" id="no_apps">
             <property name="orientation">vertical</property>
-            <property name="no-show-all">True</property>
+            <property name="no-show-all">1</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <child>
diff --git a/gtk/ui/gtkassistant.ui b/gtk/ui/gtkassistant.ui
index 000e83cbb1..feed24c897 100644
--- a/gtk/ui/gtkassistant.ui
+++ b/gtk/ui/gtkassistant.ui
@@ -29,9 +29,9 @@
             <child>
               <object class="GtkNotebook" id="content">
                 <property name="visible">1</property>
-                <property name="can_focus">1</property>
-                <property name="show_tabs">0</property>
-                <property name="show_border">0</property>
+                <property name="can-focus">1</property>
+                <property name="show-tabs">0</property>
+                <property name="show-border">0</property>
                 <signal name="remove" handler="assistant_remove_page_cb" swapped="no"/>
                 <child type="tab"/>
               </object>
@@ -48,11 +48,11 @@
                 <child>
                   <object class="GtkButton" id="apply">
                     <property name="label" translatable="yes">_Apply</property>
-                    <property name="can_focus">1</property>
-                    <property name="can_default">1</property>
-                    <property name="receives_default">1</property>
-                    <property name="no_show_all">1</property>
-                    <property name="use_underline">1</property>
+                    <property name="can-focus">1</property>
+                    <property name="can-default">1</property>
+                    <property name="receives-default">1</property>
+                    <property name="no-show-all">1</property>
+                    <property name="use-underline">1</property>
                     <style>
                       <class name="text-button"/>
                     </style>
@@ -60,18 +60,18 @@
                   </object>
                   <packing>
                     <property name="fill">0</property>
-                    <property name="pack_type">end</property>
+                    <property name="pack-type">end</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkButton" id="forward">
                     <property name="label" translatable="yes">_Next</property>
                     <property name="visible">1</property>
-                    <property name="can_focus">1</property>
-                    <property name="can_default">1</property>
-                    <property name="receives_default">1</property>
-                    <property name="no_show_all">1</property>
-                    <property name="use_underline">1</property>
+                    <property name="can-focus">1</property>
+                    <property name="can-default">1</property>
+                    <property name="receives-default">1</property>
+                    <property name="no-show-all">1</property>
+                    <property name="use-underline">1</property>
                     <style>
                       <class name="text-button"/>
                     </style>
@@ -79,7 +79,7 @@
                   </object>
                   <packing>
                     <property name="fill">0</property>
-                    <property name="pack_type">end</property>
+                    <property name="pack-type">end</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -87,10 +87,10 @@
                   <object class="GtkButton" id="back">
                     <property name="label" translatable="yes">_Back</property>
                     <property name="visible">1</property>
-                    <property name="can_focus">1</property>
-                    <property name="receives_default">1</property>
-                    <property name="no_show_all">1</property>
-                    <property name="use_underline">1</property>
+                    <property name="can-focus">1</property>
+                    <property name="receives-default">1</property>
+                    <property name="no-show-all">1</property>
+                    <property name="use-underline">1</property>
                     <style>
                       <class name="text-button"/>
                     </style>
@@ -98,17 +98,17 @@
                   </object>
                   <packing>
                     <property name="fill">0</property>
-                    <property name="pack_type">end</property>
+                    <property name="pack-type">end</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkButton" id="last">
                     <property name="label" translatable="yes">_Finish</property>
-                    <property name="can_focus">1</property>
-                    <property name="receives_default">1</property>
-                    <property name="no_show_all">1</property>
-                    <property name="use_underline">1</property>
+                    <property name="can-focus">1</property>
+                    <property name="receives-default">1</property>
+                    <property name="no-show-all">1</property>
+                    <property name="use-underline">1</property>
                     <style>
                       <class name="text-button"/>
                     </style>
@@ -116,7 +116,7 @@
                   </object>
                   <packing>
                     <property name="fill">0</property>
-                    <property name="pack_type">end</property>
+                    <property name="pack-type">end</property>
                     <property name="position">3</property>
                   </packing>
                 </child>
@@ -124,10 +124,10 @@
                   <object class="GtkButton" id="cancel">
                     <property name="label" translatable="yes">_Cancel</property>
                     <property name="visible">1</property>
-                    <property name="can_focus">1</property>
-                    <property name="receives_default">1</property>
-                    <property name="no_show_all">1</property>
-                    <property name="use_underline">1</property>
+                    <property name="can-focus">1</property>
+                    <property name="receives-default">1</property>
+                    <property name="no-show-all">1</property>
+                    <property name="use-underline">1</property>
                     <style>
                       <class name="text-button"/>
                     </style>
@@ -135,18 +135,18 @@
                   </object>
                   <packing>
                     <property name="fill">0</property>
-                    <property name="pack_type">end</property>
+                    <property name="pack-type">end</property>
                     <property name="position">4</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkButton" id="close">
                     <property name="label" translatable="yes">_Close</property>
-                    <property name="can_focus">1</property>
-                    <property name="can_default">1</property>
-                    <property name="receives_default">1</property>
-                    <property name="no_show_all">1</property>
-                    <property name="use_underline">1</property>
+                    <property name="can-focus">1</property>
+                    <property name="can-default">1</property>
+                    <property name="receives-default">1</property>
+                    <property name="no-show-all">1</property>
+                    <property name="use-underline">1</property>
                     <style>
                       <class name="text-button"/>
                     </style>
@@ -154,7 +154,7 @@
                   </object>
                   <packing>
                     <property name="fill">0</property>
-                    <property name="pack_type">end</property>
+                    <property name="pack-type">end</property>
                     <property name="position">5</property>
                   </packing>
                 </child>
diff --git a/gtk/ui/gtkcolorchooserdialog.ui b/gtk/ui/gtkcolorchooserdialog.ui
index f2696d2782..f3d250df06 100644
--- a/gtk/ui/gtkcolorchooserdialog.ui
+++ b/gtk/ui/gtkcolorchooserdialog.ui
@@ -2,9 +2,9 @@
 <interface domain="gtk30">
   <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkColorChooserDialog" parent="GtkDialog">
-    <property name="border_width">5</property>
+    <property name="border-width">5</property>
     <property name="title" translatable="yes">Select a Color</property>
-    <property name="type_hint">dialog</property>
+    <property name="type-hint">dialog</property>
     <property name="resizable">0</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -13,7 +13,7 @@
         <child>
           <object class="GtkColorChooserWidget" id="chooser">
             <property name="visible">1</property>
-            <property name="border_width">5</property>
+            <property name="border-width">5</property>
             <property name="orientation">vertical</property>
             <property name="rgba">rgb(255,255,255)</property>
             <signal name="color-activated" handler="color_activated_cb" swapped="no"/>
@@ -30,7 +30,7 @@
     <child type="action">
       <object class="GtkButton" id="cancel_button">
         <property name="visible">1</property>
-        <property name="use_underline">1</property>
+        <property name="use-underline">1</property>
         <property name="label" translatable="yes">_Cancel</property>
       </object>
     </child>
@@ -38,8 +38,8 @@
       <object class="GtkButton" id="ok_button">
         <property name="visible">1</property>
         <property name="label" translatable="yes">_Select</property>
-        <property name="use_underline">1</property>
-        <property name="can_default">1</property>
+        <property name="use-underline">1</property>
+        <property name="can-default">1</property>
       </object>
     </child>
     <action-widgets>
diff --git a/gtk/ui/gtkcoloreditor.ui b/gtk/ui/gtkcoloreditor.ui
index 664b1b5f29..76fcb6e37c 100644
--- a/gtk/ui/gtkcoloreditor.ui
+++ b/gtk/ui/gtkcoloreditor.ui
@@ -4,30 +4,30 @@
   <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkAdjustment" id="a_adj">
     <property name="upper">1</property>
-    <property name="step_increment">0.01</property>
-    <property name="page_increment">0.10000000000000001</property>
+    <property name="step-increment">0.01</property>
+    <property name="page-increment">0.10000000000000001</property>
     <signal name="value-changed" handler="hsv_changed" object="GtkColorEditor" swapped="yes"/>
   </object>
   <object class="GtkAdjustment" id="h_adj">
     <property name="upper">1</property>
-    <property name="step_increment">0.01</property>
-    <property name="page_increment">0.10000000000000001</property>
+    <property name="step-increment">0.01</property>
+    <property name="page-increment">0.10000000000000001</property>
     <signal name="value-changed" handler="hsv_changed" object="GtkColorEditor" swapped="yes"/>
   </object>
   <object class="GtkAdjustment" id="s_adj">
     <property name="upper">1</property>
-    <property name="step_increment">0.01</property>
-    <property name="page_increment">0.10000000000000001</property>
+    <property name="step-increment">0.01</property>
+    <property name="page-increment">0.10000000000000001</property>
     <signal name="value-changed" handler="hsv_changed" object="GtkColorEditor" swapped="yes"/>
   </object>
   <object class="GtkAdjustment" id="v_adj">
     <property name="upper">1</property>
-    <property name="step_increment">0.01</property>
-    <property name="page_increment">0.10000000000000001</property>
+    <property name="step-increment">0.01</property>
+    <property name="page-increment">0.10000000000000001</property>
     <signal name="value-changed" handler="hsv_changed" object="GtkColorEditor" swapped="yes"/>
   </object>
   <template class="GtkColorEditor" parent="GtkBox">
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <signal name="notify::visible" handler="dismiss_current_popup" swapped="no"/>
     <child>
       <object class="GtkOverlay" id="overlay">
@@ -36,29 +36,29 @@
         <child>
           <object class="GtkGrid" id="grid">
             <property name="visible">1</property>
-            <property name="margin_start">30</property>
-            <property name="margin_end">30</property>
-            <property name="row_spacing">12</property>
-            <property name="column_spacing">12</property>
+            <property name="margin-start">30</property>
+            <property name="margin-end">30</property>
+            <property name="row-spacing">12</property>
+            <property name="column-spacing">12</property>
             <child>
               <object class="GtkColorSwatch" id="swatch">
                 <property name="visible">True</property>
                 <property name="name">editor-color-sample</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="rgba">rgb(255,255,255)</property>
                 <property name="selectable">False</property>
-                <property name="has_menu">False</property>
+                <property name="has-menu">False</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkEntry" id="entry">
                 <property name="visible">1</property>
-                <property name="can_focus">1</property>
-                <property name="invisible_char">•</property>
+                <property name="can-focus">1</property>
+                <property name="invisible-char">•</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="entry-atkobject">
                     <property name="AtkObject::accessible-name" translatable="yes">Color Name</property>
@@ -69,58 +69,58 @@
                 <signal name="notify::text" handler="entry_text_changed" swapped="no"/>
               </object>
               <packing>
-                <property name="left_attach">2</property>
-                <property name="top_attach">0</property>
+                <property name="left-attach">2</property>
+                <property name="top-attach">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkColorScale" id="h_slider">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can-focus">True</property>
                 <property name="orientation">vertical</property>
                 <property name="adjustment">h_adj</property>
-                <property name="draw_value">False</property>
-                <property name="has_origin">False</property>
+                <property name="draw-value">False</property>
+                <property name="has-origin">False</property>
                 <signal name="popup-menu" handler="popup_edit" swapped="no"/>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
+                <property name="left-attach">0</property>
+                <property name="top-attach">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkColorScale" id="a_slider">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can-focus">True</property>
                 <property name="adjustment">a_adj</property>
-                <property name="draw_value">False</property>
-                <property name="scale_type">1</property>
-                <property name="has_origin">False</property>
+                <property name="draw-value">False</property>
+                <property name="scale-type">1</property>
+                <property name="has-origin">False</property>
                 <style>
                   <class name="scale-has-marks-above"/>
                 </style>
                 <signal name="popup-menu" handler="popup_edit" swapped="no"/>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">2</property>
                 <property name="width">2</property>
               </packing>
             </child>
             <child>
               <object class="GtkColorPlane" id="sv_plane">
-                <property name="width_request">300</property>
-                <property name="height_request">300</property>
+                <property name="width-request">300</property>
+                <property name="height-request">300</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="h_adjustment">h_adj</property>
-                <property name="s_adjustment">s_adj</property>
-                <property name="v_adjustment">v_adj</property>
+                <property name="can-focus">True</property>
+                <property name="h-adjustment">h_adj</property>
+                <property name="s-adjustment">s_adj</property>
+                <property name="v-adjustment">v_adj</property>
                 <signal name="popup-menu" handler="popup_edit" swapped="no"/>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">1</property>
                 <property name="width">2</property>
               </packing>
             </child>
@@ -135,7 +135,7 @@
     </child>
   </template>
   <object class="GtkBox" id="a_popup">
-    <property name="no_show_all">1</property>
+    <property name="no-show-all">1</property>
     <style>
       <class name="popover"/>
       <class name="osd"/>
@@ -144,28 +144,28 @@
     <child>
       <object class="GtkGrid" id="grid4">
         <property name="visible">1</property>
-        <property name="margin_start">12</property>
-        <property name="margin_end">12</property>
-        <property name="margin_top">12</property>
-        <property name="margin_bottom">12</property>
-        <property name="column_spacing">6</property>
+        <property name="margin-start">12</property>
+        <property name="margin-end">12</property>
+        <property name="margin-top">12</property>
+        <property name="margin-bottom">12</property>
+        <property name="column-spacing">6</property>
         <child>
           <object class="GtkLabel" id="label4">
             <property name="visible">1</property>
             <property name="label" translatable="yes" context="Color channel">A</property>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkSpinButton" id="a_entry">
             <property name="visible">1</property>
-            <property name="can_focus">1</property>
+            <property name="can-focus">1</property>
             <property name="width-chars">2</property>
             <property name="max-width-chars">2</property>
-            <property name="climb_rate">1</property>
+            <property name="climb-rate">1</property>
             <child internal-child="accessible">
               <object class="AtkObject" id="a_entry-atkobject">
                 <property name="AtkObject::accessible-name" translatable="yes">Alpha</property>
@@ -174,15 +174,15 @@
             <signal name="key-press-event" handler="popup_key_press" swapped="no"/>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
+            <property name="left-attach">1</property>
+            <property name="top-attach">0</property>
           </packing>
         </child>
       </object>
     </child>
   </object>
   <object class="GtkBox" id="h_popup">
-    <property name="no_show_all">1</property>
+    <property name="no-show-all">1</property>
     <style>
       <class name="popover"/>
       <class name="osd"/>
@@ -191,28 +191,28 @@
     <child>
       <object class="GtkGrid" id="grid3">
         <property name="visible">1</property>
-        <property name="margin_start">12</property>
-        <property name="margin_end">12</property>
-        <property name="margin_top">12</property>
-        <property name="margin_bottom">12</property>
-        <property name="column_spacing">6</property>
+        <property name="margin-start">12</property>
+        <property name="margin-end">12</property>
+        <property name="margin-top">12</property>
+        <property name="margin-bottom">12</property>
+        <property name="column-spacing">6</property>
         <child>
           <object class="GtkLabel" id="label3">
             <property name="visible">1</property>
             <property name="label" translatable="yes" context="Color channel">H</property>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkSpinButton" id="h_entry">
             <property name="visible">1</property>
-            <property name="can_focus">1</property>
+            <property name="can-focus">1</property>
             <property name="width-chars">2</property>
             <property name="max-width-chars">2</property>
-            <property name="climb_rate">1</property>
+            <property name="climb-rate">1</property>
             <child internal-child="accessible">
               <object class="AtkObject" id="h_entry-atkobject">
                 <property name="AtkObject::accessible-name" translatable="yes">Hue</property>
@@ -221,15 +221,15 @@
             <signal name="key-press-event" handler="popup_key_press" swapped="no"/>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
+            <property name="left-attach">1</property>
+            <property name="top-attach">0</property>
           </packing>
         </child>
       </object>
     </child>
   </object>
   <object class="GtkBox" id="sv_popup">
-    <property name="no_show_all">1</property>
+    <property name="no-show-all">1</property>
     <style>
       <class name="popover"/>
       <class name="osd"/>
@@ -238,20 +238,20 @@
     <child>
       <object class="GtkGrid" id="grid2">
         <property name="visible">1</property>
-        <property name="margin_start">12</property>
-        <property name="margin_end">12</property>
-        <property name="margin_top">12</property>
-        <property name="margin_bottom">12</property>
-        <property name="row_spacing">6</property>
-        <property name="column_spacing">6</property>
+        <property name="margin-start">12</property>
+        <property name="margin-end">12</property>
+        <property name="margin-top">12</property>
+        <property name="margin-bottom">12</property>
+        <property name="row-spacing">6</property>
+        <property name="column-spacing">6</property>
         <child>
           <object class="GtkLabel" id="label1">
             <property name="visible">1</property>
             <property name="label" translatable="yes" context="Color Channel">S</property>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">0</property>
           </packing>
         </child>
         <child>
@@ -260,17 +260,17 @@
             <property name="label" translatable="yes" context="Color Channel">V</property>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkSpinButton" id="s_entry">
             <property name="visible">1</property>
-            <property name="can_focus">1</property>
+            <property name="can-focus">1</property>
             <property name="width-chars">2</property>
             <property name="max-width-chars">2</property>
-            <property name="climb_rate">1</property>
+            <property name="climb-rate">1</property>
             <child internal-child="accessible">
               <object class="AtkObject" id="s_entry-atkobject">
                 <property name="AtkObject::accessible-name" translatable="yes">Saturation</property>
@@ -279,17 +279,17 @@
             <signal name="key-press-event" handler="popup_key_press" swapped="no"/>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
+            <property name="left-attach">1</property>
+            <property name="top-attach">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkSpinButton" id="v_entry">
             <property name="visible">1</property>
-            <property name="can_focus">1</property>
+            <property name="can-focus">1</property>
             <property name="width-chars">2</property>
             <property name="max-width-chars">2</property>
-            <property name="climb_rate">1</property>
+            <property name="climb-rate">1</property>
             <child internal-child="accessible">
               <object class="AtkObject" id="v_entry-atkobject">
                 <property name="AtkObject::accessible-name" translatable="yes">Value</property>
@@ -298,8 +298,8 @@
             <signal name="key-press-event" handler="popup_key_press" swapped="no"/>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
+            <property name="left-attach">1</property>
+            <property name="top-attach">1</property>
           </packing>
         </child>
       </object>
diff --git a/gtk/ui/gtkcombobox.ui b/gtk/ui/gtkcombobox.ui
index a7969a0d72..2e6ac30a2b 100644
--- a/gtk/ui/gtkcombobox.ui
+++ b/gtk/ui/gtkcombobox.ui
@@ -18,17 +18,17 @@
                 <child>
                   <object class="GtkIcon" id="arrow">
                     <property name="visible">1</property>
-                    <property name="css_name">arrow</property>
+                    <property name="css-name">arrow</property>
                   </object>
                   <packing>
-                    <property name="pack_type">end</property>
+                    <property name="pack-type">end</property>
                   </packing>
                 </child>
               </object>
             </child>
           </object>
           <packing>
-            <property name="pack_type">end</property>
+            <property name="pack-type">end</property>
           </packing>
         </child>
       </object>
diff --git a/gtk/ui/gtkdialog.ui b/gtk/ui/gtkdialog.ui
index 3c400c60c2..214cbd4597 100644
--- a/gtk/ui/gtkdialog.ui
+++ b/gtk/ui/gtkdialog.ui
@@ -2,8 +2,8 @@
 <interface domain="gtk30">
   <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkDialog" parent="GtkWindow">
-    <property name="window_position">center-on-parent</property>
-    <property name="type_hint">dialog</property>
+    <property name="window-position">center-on-parent</property>
+    <property name="type-hint">dialog</property>
     <signal name="delete-event" handler="gtk_dialog_delete_event_handler" swapped="no"/>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="headerbar">
@@ -14,7 +14,6 @@
     <child>
       <object class="GtkBox" id="vbox">
         <property name="visible">1</property>
-        <property name="border_width">0</property>
         <property name="orientation">vertical</property>
         <style>
           <class name="dialog-vbox"/>
@@ -28,19 +27,19 @@
             <child>
               <object class="GtkButtonBox" id="action_area">
                 <property name="visible">1</property>
-                <property name="layout_style">end</property>
+                <property name="layout-style">end</property>
                 <property name="hexpand">1</property>
                 <style>
                   <class name="dialog-action-area"/>
                 </style>
               </object>
               <packing>
-                <property name="pack_type">end</property>
+                <property name="pack-type">end</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="pack_type">end</property>
+            <property name="pack-type">end</property>
           </packing>
         </child>
       </object>
diff --git a/gtk/ui/gtkfilechooserbutton.ui b/gtk/ui/gtkfilechooserbutton.ui
index 6aa337b5a1..0c80df23c9 100644
--- a/gtk/ui/gtkfilechooserbutton.ui
+++ b/gtk/ui/gtkfilechooserbutton.ui
@@ -5,8 +5,8 @@
     <child>
       <object class="GtkButton" id="button">
         <property name="visible">1</property>
-        <property name="can_focus">1</property>
-        <property name="receives_default">1</property>
+        <property name="can-focus">1</property>
+        <property name="receives-default">1</property>
         <signal name="clicked" handler="button_clicked_cb" swapped="no"/>
         <style>
           <class name="file"/>
@@ -18,7 +18,7 @@
             <child>
               <object class="GtkImage" id="image">
                 <property name="visible">1</property>
-                <property name="icon_name">image-missing</property>
+                <property name="icon-name">image-missing</property>
               </object>
               <packing>
                 <property name="fill">0</property>
@@ -51,9 +51,9 @@
             <child>
               <object class="GtkImage" id="open_file_icon">
                 <property name="visible">1</property>
-                <property name="icon_name">document-open-symbolic</property>
-                <property name="icon_size">1</property>
-                <property name="use_fallback">1</property>
+                <property name="icon-name">document-open-symbolic</property>
+                <property name="icon-size">1</property>
+                <property name="use-fallback">1</property>
                 <property name="valign">baseline</property>
               </object>
               <packing>
diff --git a/gtk/ui/gtkfilechooserdialog.ui b/gtk/ui/gtkfilechooserdialog.ui
index 567fde8a50..0e2d81127f 100644
--- a/gtk/ui/gtkfilechooserdialog.ui
+++ b/gtk/ui/gtkfilechooserdialog.ui
@@ -3,20 +3,19 @@
   <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkFileChooserDialog" parent="GtkDialog">
     <property name="role">GtkFileChooserDialog</property>
-    <property name="type_hint">dialog</property>
-    <property name="default_width">600</property>
+    <property name="type-hint">dialog</property>
+    <property name="default-width">600</property>
     <signal name="response" handler="response_cb" swapped="no"/>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="orientation">vertical</property>
-        <property name="border_width">0</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
-            <property name="border_width">6</property>
-            <property name="layout_style">end</property>
+            <property name="border-width">6</property>
+            <property name="layout-style">end</property>
           </object>
           <packing>
-            <property name="pack_type">end</property>
+            <property name="pack-type">end</property>
           </packing>
         </child>
         <child>
diff --git a/gtk/ui/gtkfilechooserwidget.ui b/gtk/ui/gtkfilechooserwidget.ui
index bc762032eb..b42c2ccae2 100644
--- a/gtk/ui/gtkfilechooserwidget.ui
+++ b/gtk/ui/gtkfilechooserwidget.ui
@@ -14,9 +14,9 @@
             <child>
               <object class="GtkPlacesSidebar" id="places_sidebar">
                 <property name="visible">1</property>
-                <property name="hscrollbar_policy">never</property>
-                <property name="local_only">1</property>
-                <property name="show_other_locations">1</property>
+                <property name="hscrollbar-policy">never</property>
+                <property name="local-only">1</property>
+                <property name="show-other-locations">1</property>
                 <style>
                   <class name="sidebar"/>
                 </style>
@@ -54,7 +54,7 @@
                               <object class="GtkBox">
                                 <property name="visible">1</property>
                                 <property name="spacing">6</property>
-                                <property name="border_width">6</property>
+                                <property name="border-width">6</property>
                                 <child>
                                   <object class="GtkPathBar" id="browse_path_bar">
                                     <property name="visible">True</property>
@@ -67,7 +67,7 @@
                                 <child>
                                   <object class="GtkMenuButton" id="browse_new_folder_button">
                                     <property name="tooltip-text" translatable="yes">Create Folder</property>
-                                    <property name="use_underline">1</property>
+                                    <property name="use-underline">1</property>
                                     <property name="popover">new_folder_popover</property>
                                     <signal name="notify::active" handler="new_folder_popover_active"/>
                                     <child>
@@ -80,7 +80,7 @@
                                   </object>
                                   <packing>
                                     <property name="fill">0</property>
-                                    <property name="pack_type">end</property>
+                                    <property name="pack-type">end</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
@@ -94,7 +94,7 @@
                                 <property name="visible">1</property>
                                 <property name="no-show-all">1</property>
                                 <property name="spacing">6</property>
-                                <property name="border_width">6</property>
+                                <property name="border-width">6</property>
                               </object>
                               <packing>
                                 <property name="name">location</property>
@@ -105,7 +105,7 @@
                                 <property name="visible">1</property>
                                 <property name="no-show-all">1</property>
                                 <property name="spacing">6</property>
-                                <property name="border_width">6</property>
+                                <property name="border-width">6</property>
                                 <child type="center">
                                   <object class="GtkSearchEntry" id="search_entry">
                                     <property name="visible">1</property>
@@ -157,11 +157,11 @@
                             <child>
                               <object class="GtkScrolledWindow" id="browse_files_swin">
                                 <property name="visible">1</property>
-                                <property name="hscrollbar_policy">never</property>
+                                <property name="hscrollbar-policy">never</property>
                                 <child>
                                   <object class="GtkTreeView" id="browse_files_tree_view">
                                     <property name="visible">1</property>
-                                    <property name="has_tooltip">1</property>
+                                    <property name="has-tooltip">1</property>
                                     <property name="enable-search">0</property>
                                     <child internal-child="accessible">
                                       <object class="AtkObject" id="browse_files_tree_view-atkobject">
@@ -271,7 +271,7 @@
                         <child>
                           <object class="GtkPlacesView" id="places_view">
                             <property name="visible">True</property>
-                            <property name="local_only" bind-source="GtkFileChooserWidget" bind-property="local-only" bind-flags="default|sync-create"/>
+                            <property name="local-only" bind-source="GtkFileChooserWidget" bind-property="local-only" bind-flags="default|sync-create"/>
                             <signal name="open-location" handler="places_sidebar_open_location_cb" swapped="no"/>
                             <signal name="show-error-message" handler="places_sidebar_show_error_message_cb" swapped="no"/>
                           </object>
@@ -282,7 +282,7 @@
                         <child>
                           <object class="GtkGrid">
                             <property name="visible">1</property>
-                            <property name="row_spacing">12</property>
+                            <property name="row-spacing">12</property>
                             <property name="hexpand">1</property>
                             <property name="vexpand">1</property>
                             <property name="halign">center</property>
@@ -300,8 +300,8 @@
                                 </style>
                               </object>
                               <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">0</property>
+                                <property name="left-attach">0</property>
+                                <property name="top-attach">0</property>
                               </packing>
                             </child>
                             <child>
@@ -314,8 +314,8 @@
                                 </attributes>
                               </object>
                               <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">1</property>
+                                <property name="left-attach">0</property>
+                                <property name="top-attach">1</property>
                               </packing>
                             </child>
                             <child>
@@ -327,8 +327,8 @@
                                 </style>
                               </object>
                               <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">2</property>
+                                <property name="left-attach">0</property>
+                                <property name="top-attach">2</property>
                               </packing>
                             </child>
                           </object>
@@ -389,27 +389,27 @@
             <child>
               <object class="GtkComboBoxText" id="filter_combo">
                 <property name="visible">1</property>
-                <property name="tooltip_text" translatable="yes">Select which types of files are shown</property>
-                <property name="focus_on_click">0</property>
-                <property name="entry_text_column">0</property>
-                <property name="id_column">1</property>
+                <property name="tooltip-text" translatable="yes">Select which types of files are shown</property>
+                <property name="focus-on-click">0</property>
+                <property name="entry-text-column">0</property>
+                <property name="id-column">1</property>
                 <property name="valign">start</property>
                 <signal name="changed" handler="filter_combo_changed" swapped="no"/>
               </object>
               <packing>
                 <property name="fill">0</property>
-                <property name="pack_type">end</property>
+                <property name="pack-type">end</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="pack_type">end</property>
+            <property name="pack-type">end</property>
           </packing>
         </child>
       </object>
       <packing>
         <property name="position">1</property>
-        <property name="pack_type">end</property>
+        <property name="pack-type">end</property>
       </packing>
     </child>
   </template>
@@ -432,7 +432,7 @@
             <property name="visible">1</property>
             <property name="label" translatable="yes">Folder Name</property>
             <property name="halign">start</property>
-            <property name="mnemonic_widget">new_folder_name_entry</property>
+            <property name="mnemonic-widget">new_folder_name_entry</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -445,7 +445,7 @@
           <object class="GtkEntry" id="new_folder_name_entry">
             <property name="visible">1</property>
             <property name="width-chars">25</property>
-            <property name="activates_default">1</property>
+            <property name="activates-default">1</property>
             <signal name="changed" handler="new_folder_name_changed"/>
           </object>
           <packing>
@@ -458,8 +458,8 @@
             <property name="visible">1</property>
             <property name="sensitive">0</property>
             <property name="label" translatable="yes">_Create</property>
-            <property name="use_underline">1</property>
-            <property name="can_default">1</property>
+            <property name="use-underline">1</property>
+            <property name="can-default">1</property>
             <signal name="clicked" handler="new_folder_create_clicked"/>
             <style>
               <class name="suggested-action"/>
@@ -498,7 +498,7 @@
             <property name="visible">1</property>
             <property name="label" translatable="yes">Name</property>
             <property name="halign">start</property>
-            <property name="mnemonic_widget">rename_file_name_entry</property>
+            <property name="mnemonic-widget">rename_file_name_entry</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -523,8 +523,8 @@
             <property name="visible">1</property>
             <property name="sensitive">0</property>
             <property name="label" translatable="yes">_Rename</property>
-            <property name="use_underline">1</property>
-            <property name="can_default">1</property>
+            <property name="use-underline">1</property>
+            <property name="can-default">1</property>
             <signal name="clicked" handler="rename_file_rename_clicked"/>
             <style>
               <class name="suggested-action"/>
diff --git a/gtk/ui/gtkfontbutton.ui b/gtk/ui/gtkfontbutton.ui
index 1342bb799f..5b8e646db1 100644
--- a/gtk/ui/gtkfontbutton.ui
+++ b/gtk/ui/gtkfontbutton.ui
@@ -2,8 +2,8 @@
 <interface domain="gtk30">
   <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkFontButton" parent="GtkButton">
-    <property name="can_focus">1</property>
-    <property name="receives_default">1</property>
+    <property name="can-focus">1</property>
+    <property name="receives-default">1</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="visible">1</property>
@@ -20,7 +20,7 @@
         <child>
           <object class="GtkBox" id="font_size_box">
             <property name="visible">1</property>
-            <property name="no_show_all">1</property>
+            <property name="no-show-all">1</property>
             <child>
               <object class="GtkSeparator" id="separator">
                 <property name="visible">1</property>
diff --git a/gtk/ui/gtkfontchooserdialog.ui b/gtk/ui/gtkfontchooserdialog.ui
index e6672f1559..96891031d8 100644
--- a/gtk/ui/gtkfontchooserdialog.ui
+++ b/gtk/ui/gtkfontchooserdialog.ui
@@ -2,9 +2,9 @@
 <interface domain="gtk30">
   <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkFontChooserDialog" parent="GtkDialog">
-    <property name="border_width">5</property>
+    <property name="border-width">5</property>
     <property name="title" translatable="yes">Select Font</property>
-    <property name="type_hint">dialog</property>
+    <property name="type-hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="orientation">vertical</property>
@@ -12,7 +12,7 @@
         <child>
           <object class="GtkFontChooserWidget" id="fontchooser">
             <property name="visible">1</property>
-            <property name="border_width">5</property>
+            <property name="border-width">5</property>
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <signal name="font-activated" handler="font_activated_cb" swapped="no"/>
@@ -27,7 +27,7 @@
     <child type="action">
       <object class="GtkButton" id="cancel_button">
         <property name="visible">1</property>
-        <property name="use_underline">1</property>
+        <property name="use-underline">1</property>
         <property name="label" translatable="yes">_Cancel</property>
       </object>
     </child>
@@ -35,8 +35,8 @@
       <object class="GtkButton" id="ok_button">
         <property name="visible">1</property>
         <property name="label" translatable="yes">_Select</property>
-        <property name="use_underline">1</property>
-        <property name="can_default">1</property>
+        <property name="use-underline">1</property>
+        <property name="can-default">1</property>
       </object>
     </child>
     <action-widgets>
diff --git a/gtk/ui/gtkfontchooserwidget.ui b/gtk/ui/gtkfontchooserwidget.ui
index d49a04c8b1..48786f1463 100644
--- a/gtk/ui/gtkfontchooserwidget.ui
+++ b/gtk/ui/gtkfontchooserwidget.ui
@@ -14,46 +14,46 @@
     </columns>
   </object>
   <object class="GtkTreeModelFilter" id="filter_model">
-    <property name="child_model">model</property>
+    <property name="child-model">model</property>
     <signal name="row-deleted" handler="row_deleted_cb" swapped="no"/>
     <signal name="row-inserted" handler="row_inserted_cb" swapped="no"/>
   </object>
   <object class="GtkAdjustment" id="slider_adjustment">
     <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
     <signal name="value-changed" handler="size_change_cb" swapped="no"/>
   </object>
   <object class="GtkAdjustment" id="spin_adjustment">
     <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
     <signal name="value-changed" handler="size_change_cb" swapped="no"/>
   </object>
   <template class="GtkFontChooserWidget" parent="GtkBox">
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="visible">1</property>
-        <property name="row_spacing">6</property>
-        <property name="column_spacing">6</property>
+        <property name="row-spacing">6</property>
+        <property name="column-spacing">6</property>
         <child>
           <object class="GtkSearchEntry" id="search_entry">
             <property name="visible">1</property>
-            <property name="can_focus">1</property>
+            <property name="can-focus">1</property>
             <property name="hexpand">1</property>
-            <property name="activates_default">1</property>
-            <property name="primary_icon_name">edit-find-symbolic</property>
-            <property name="primary_icon_activatable">0</property>
-            <property name="secondary_icon_activatable">0</property>
-            <property name="primary_icon_sensitive">0</property>
-            <property name="secondary_icon_sensitive">0</property>
-            <property name="placeholder_text" translatable="yes">Search font name</property>
+            <property name="activates-default">1</property>
+            <property name="primary-icon-name">edit-find-symbolic</property>
+            <property name="primary-icon-activatable">0</property>
+            <property name="secondary-icon-activatable">0</property>
+            <property name="primary-icon-sensitive">0</property>
+            <property name="secondary-icon-sensitive">0</property>
+            <property name="placeholder-text" translatable="yes">Search font name</property>
             <signal name="search-changed" handler="text_changed_cb" swapped="no"/>
             <signal name="stop-search" handler="stop_search_cb" swapped="no"/>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">0</property>
             <property name="width">2</property>
           </packing>
         </child>
@@ -63,26 +63,26 @@
             <child>
               <object class="GtkGrid">
                 <property name="visible">1</property>
-                <property name="row_spacing">6</property>
-                <property name="column_spacing">6</property>
+                <property name="row-spacing">6</property>
+                <property name="column-spacing">6</property>
                 <child>
                   <object class="GtkScrolledWindow" id="list_scrolled_window">
-                    <property name="width_request">400</property>
-                    <property name="height_request">300</property>
+                    <property name="width-request">400</property>
+                    <property name="height-request">300</property>
                     <property name="visible">1</property>
-                    <property name="can_focus">1</property>
+                    <property name="can-focus">1</property>
                     <property name="hexpand">1</property>
                     <property name="vexpand">1</property>
-                    <property name="hscrollbar_policy">never</property>
-                    <property name="shadow_type">etched-in</property>
+                    <property name="hscrollbar-policy">never</property>
+                    <property name="shadow-type">etched-in</property>
                     <child>
                       <object class="GtkTreeView" id="family_face_list">
                         <property name="visible">1</property>
-                        <property name="can_focus">1</property>
+                        <property name="can-focus">1</property>
                         <property name="model">filter_model</property>
-                        <property name="headers_visible">0</property>
-                        <property name="enable_search">0</property>
-                        <property name="fixed_height_mode">1</property>
+                        <property name="headers-visible">0</property>
+                        <property name="enable-search">0</property>
+                        <property name="fixed-height-mode">1</property>
                         <signal name="cursor-changed" handler="cursor_changed_cb" swapped="no"/>
                         <signal name="row-activated" handler="row_activated_cb" swapped="no"/>
                         <signal name="style-updated" handler="gtk_font_chooser_widget_set_cell_size" object="GtkFontChooserWidget" after="yes" swapped="yes"/>
@@ -106,51 +106,51 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">1</property>
                     <property name="width">2</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkEntry" id="preview">
                     <property name="visible">1</property>
-                    <property name="can_focus">1</property>
-                    <property name="invisible_char">•</property>
+                    <property name="can-focus">1</property>
+                    <property name="invisible-char">•</property>
                     <property name="placeholder-text" translatable="yes">Preview text</property>
                     <signal name="scroll-event" handler="resize_by_scroll_cb" swapped="no"/>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">2</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">2</property>
                     <property name="width">2</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkScale" id="size_slider">
                     <property name="visible">1</property>
-                    <property name="can_focus">1</property>
+                    <property name="can-focus">1</property>
                     <property name="hexpand">1</property>
                     <property name="adjustment">slider_adjustment</property>
-                    <property name="draw_value">0</property>
+                    <property name="draw-value">0</property>
                     <property name="round-digits">0</property>
                     <signal name="scroll-event" handler="resize_by_scroll_cb" swapped="no"/>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">3</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">3</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkSpinButton" id="size_spin">
                     <property name="visible">1</property>
-                    <property name="can_focus">1</property>
-                    <property name="invisible_char">•</property>
+                    <property name="can-focus">1</property>
+                    <property name="invisible-char">•</property>
                     <property name="adjustment">spin_adjustment</property>
                     <signal name="output" handler="output_cb"/>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">3</property>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">3</property>
                   </packing>
                 </child>
               </object>
@@ -161,7 +161,7 @@
             <child>
               <object class="GtkGrid">
                 <property name="visible">1</property>
-                <property name="row_spacing">12</property>
+                <property name="row-spacing">12</property>
                 <property name="hexpand">1</property>
                 <property name="vexpand">1</property>
                 <property name="halign">center</property>
@@ -176,8 +176,8 @@
                     <property name="pixel-size">64</property>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">0</property>
                   </packing>
                 </child>
                 <child>
@@ -190,8 +190,8 @@
                     </attributes>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">1</property>
                   </packing>
                 </child>
               </object>
@@ -201,8 +201,8 @@
             </child>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">1</property>
             <property name="width">2</property>
           </packing>
         </child>
diff --git a/gtk/ui/gtkinfobar.ui b/gtk/ui/gtkinfobar.ui
index 3fc1bf5038..6db47d000b 100644
--- a/gtk/ui/gtkinfobar.ui
+++ b/gtk/ui/gtkinfobar.ui
@@ -2,7 +2,7 @@
 <interface domain="gtk30">
   <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkInfoBar" parent="GtkBox">
-    <property name="app_paintable">1</property>
+    <property name="app-paintable">1</property>
     <child>
       <object class="GtkRevealer" id="revealer">
         <property name="visible">1</property>
@@ -12,7 +12,7 @@
             <child>
               <object class="GtkBox" id="content_area">
                 <property name="visible">1</property>
-                <property name="border_width">8</property>
+                <property name="border-width">8</property>
                 <property name="spacing">16</property>
                 <property name="hexpand">1</property>
               </object>
@@ -23,9 +23,9 @@
             <child>
               <object class="GtkButtonBox" id="action_area">
                 <property name="visible">1</property>
-                <property name="border_width">6</property>
+                <property name="border-width">6</property>
                 <property name="spacing">6</property>
-                <property name="layout_style">end</property>
+                <property name="layout-style">end</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -33,8 +33,8 @@
             </child>
             <child>
               <object class="GtkButton" id="close_button">
-                <property name="can_focus">1</property>
-                <property name="border_width">6</property>
+                <property name="can-focus">1</property>
+                <property name="border-width">6</property>
                 <property name="relief">none</property>
                 <property name="valign">center</property>
                 <style>
@@ -44,7 +44,7 @@
                 <child>
                   <object class="GtkImage" id="close_image">
                     <property name="visible">1</property>
-                    <property name="icon_name">window-close-symbolic</property>
+                    <property name="icon-name">window-close-symbolic</property>
                   </object>
                 </child>
               </object>
diff --git a/gtk/ui/gtklockbutton.ui b/gtk/ui/gtklockbutton.ui
index c076971460..ea63b86832 100644
--- a/gtk/ui/gtklockbutton.ui
+++ b/gtk/ui/gtklockbutton.ui
@@ -3,8 +3,8 @@
   <!-- interface-requires gtk+ 3.6 -->
   <template class="GtkLockButton" parent="GtkButton">
     <property name="visible">1</property>
-    <property name="can_focus">1</property>
-    <property name="receives_default">1</property>
+    <property name="can-focus">1</property>
+    <property name="receives-default">1</property>
     <child>
       <object class="GtkBox" id="box">
         <property name="visible">1</property>
@@ -14,7 +14,7 @@
         <child>
           <object class="GtkImage" id="image">
             <property name="visible">1</property>
-            <property name="icon_name">image-missing</property>
+            <property name="icon-name">image-missing</property>
           </object>
           <packing>
             <property name="fill">0</property>
diff --git a/gtk/ui/gtkmessagedialog.ui b/gtk/ui/gtkmessagedialog.ui
index 32f1f71505..ed0626c781 100644
--- a/gtk/ui/gtkmessagedialog.ui
+++ b/gtk/ui/gtkmessagedialog.ui
@@ -4,8 +4,8 @@
   <template class="GtkMessageDialog" parent="GtkDialog">
     <property name="title"></property>
     <property name="resizable">0</property>
-    <property name="type_hint">dialog</property>
-    <property name="skip_taskbar_hint">1</property>
+    <property name="type-hint">dialog</property>
+    <property name="skip-taskbar-hint">1</property>
     <child internal-child="headerbar">
       <object class="GtkHeaderBar" id="headerbar1">
         <property name="visible">1</property>
@@ -14,13 +14,12 @@
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="orientation">vertical</property>
-        <property name="border_width">0</property>
         <property name="spacing">20</property>
         <child>
           <object class="GtkBox" id="box">
             <property name="visible">1</property>
-            <property name="margin_start">30</property>
-            <property name="margin_end">30</property>
+            <property name="margin-start">30</property>
+            <property name="margin-end">30</property>
             <property name="spacing">30</property>
             <child>
               <object class="GtkBox" id="message_area">
@@ -41,7 +40,7 @@
                 </child>
                 <child>
                   <object class="GtkLabel" id="secondary_label">
-                    <property name="no_show_all">1</property>
+                    <property name="no-show-all">1</property>
                     <property name="margin-bottom">2</property>
                     <property name="halign">center</property>
                     <property name="valign">start</property>
diff --git a/gtk/ui/gtkpagesetupunixdialog.ui b/gtk/ui/gtkpagesetupunixdialog.ui
index 287088cc9d..ae52ba0147 100644
--- a/gtk/ui/gtkpagesetupunixdialog.ui
+++ b/gtk/ui/gtkpagesetupunixdialog.ui
@@ -24,10 +24,10 @@
     </columns>
   </object>
   <template class="GtkPageSetupUnixDialog" parent="GtkDialog">
-    <property name="can_focus">False</property>
-    <property name="border_width">5</property>
+    <property name="can-focus">False</property>
+    <property name="border-width">5</property>
     <property name="resizable">False</property>
-    <property name="type_hint">dialog</property>
+    <property name="type-hint">dialog</property>
     <property name="title" translatable="yes">Page Setup</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -36,21 +36,21 @@
         <child>
           <object class="GtkGrid" id="grid1">
             <property name="visible">1</property>
-            <property name="border_width">5</property>
-            <property name="row_spacing">6</property>
-            <property name="column_spacing">12</property>
+            <property name="border-width">5</property>
+            <property name="row-spacing">6</property>
+            <property name="column-spacing">12</property>
             <child>
               <object class="GtkLabel" id="printer_combo_label">
                 <property name="visible">1</property>
                 <property name="halign">start</property>
                 <property name="valign">center</property>
                 <property name="label" translatable="yes">_Format for:</property>
-                <property name="use_underline">1</property>
-                <property name="mnemonic_widget">printer_combo</property>
+                <property name="use-underline">1</property>
+                <property name="mnemonic-widget">printer_combo</property>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
+                <property name="left-attach">0</property>
+                <property name="top-attach">0</property>
               </packing>
             </child>
             <child>
@@ -67,8 +67,8 @@
                 </child>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">0</property>
                 <property name="width">3</property>
               </packing>
             </child>
@@ -78,12 +78,12 @@
                 <property name="halign">start</property>
                 <property name="valign">center</property>
                 <property name="label" translatable="yes">_Paper size:</property>
-                <property name="use_underline">1</property>
-                <property name="mnemonic_widget">paper_size_combo</property>
+                <property name="use-underline">1</property>
+                <property name="mnemonic-widget">paper_size_combo</property>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
+                <property name="left-attach">0</property>
+                <property name="top-attach">1</property>
               </packing>
             </child>
             <child>
@@ -97,8 +97,8 @@
                 </child>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">1</property>
                 <property name="width">3</property>
               </packing>
             </child>
@@ -109,8 +109,8 @@
                 <property name="valign">center</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">2</property>
                 <property name="width">3</property>
               </packing>
             </child>
@@ -120,21 +120,21 @@
                 <property name="halign">start</property>
                 <property name="valign">center</property>
                 <property name="label" translatable="yes">_Orientation:</property>
-                <property name="use_underline">1</property>
-                <property name="mnemonic_widget">portrait_radio</property>
+                <property name="use-underline">1</property>
+                <property name="mnemonic-widget">portrait_radio</property>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">3</property>
+                <property name="left-attach">0</property>
+                <property name="top-attach">3</property>
               </packing>
             </child>
             <child>
               <object class="GtkRadioButton" id="portrait_radio">
                 <property name="visible">1</property>
-                <property name="can_focus">1</property>
+                <property name="can-focus">1</property>
                 <property name="hexpand">1</property>
                 <property name="active">1</property>
-                <property name="draw_indicator">1</property>
+                <property name="draw-indicator">1</property>
                 <child>
                   <object class="GtkBox" id="box1">
                     <property name="visible">1</property>
@@ -142,8 +142,8 @@
                     <child>
                       <object class="GtkImage" id="image1">
                         <property name="visible">1</property>
-                        <property name="icon_name">gtk-orientation-portrait</property>
-                        <property name="icon_size">3</property>
+                        <property name="icon-name">gtk-orientation-portrait</property>
+                        <property name="icon-size">3</property>
                       </object>
                     </child>
                     <child>
@@ -159,17 +159,17 @@
                 </child>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">3</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">3</property>
               </packing>
             </child>
             <child>
               <object class="GtkRadioButton" id="reverse_portrait_radio">
                 <property name="visible">1</property>
-                <property name="can_focus">1</property>
+                <property name="can-focus">1</property>
                 <property name="hexpand">1</property>
                 <property name="active">1</property>
-                <property name="draw_indicator">1</property>
+                <property name="draw-indicator">1</property>
                 <property name="group">portrait_radio</property>
                 <child>
                   <object class="GtkBox" id="box2">
@@ -178,8 +178,8 @@
                     <child>
                       <object class="GtkImage" id="image2">
                         <property name="visible">1</property>
-                        <property name="icon_name">gtk-orientation-reverse-portrait</property>
-                        <property name="icon_size">3</property>
+                        <property name="icon-name">gtk-orientation-reverse-portrait</property>
+                        <property name="icon-size">3</property>
                       </object>
                     </child>
                     <child>
@@ -195,17 +195,17 @@
                 </child>
               </object>
               <packing>
-                <property name="left_attach">2</property>
-                <property name="top_attach">3</property>
+                <property name="left-attach">2</property>
+                <property name="top-attach">3</property>
               </packing>
             </child>
             <child>
               <object class="GtkRadioButton" id="landscape_radio">
                 <property name="visible">1</property>
-                <property name="can_focus">1</property>
+                <property name="can-focus">1</property>
                 <property name="hexpand">1</property>
                 <property name="active">1</property>
-                <property name="draw_indicator">1</property>
+                <property name="draw-indicator">1</property>
                 <property name="group">portrait_radio</property>
                 <child>
                   <object class="GtkBox" id="box3">
@@ -214,8 +214,8 @@
                     <child>
                       <object class="GtkImage" id="image3">
                         <property name="visible">1</property>
-                        <property name="icon_name">gtk-orientation-landscape</property>
-                        <property name="icon_size">3</property>
+                        <property name="icon-name">gtk-orientation-landscape</property>
+                        <property name="icon-size">3</property>
                       </object>
                     </child>
                     <child>
@@ -231,16 +231,16 @@
                 </child>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">4</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">4</property>
               </packing>
             </child>
             <child>
               <object class="GtkRadioButton" id="reverse_landscape_radio">
                 <property name="visible">1</property>
-                <property name="can_focus">1</property>
+                <property name="can-focus">1</property>
                 <property name="hexpand">1</property>
-                <property name="draw_indicator">1</property>
+                <property name="draw-indicator">1</property>
                 <property name="group">portrait_radio</property>
                 <child>
                   <object class="GtkBox" id="box4">
@@ -249,8 +249,8 @@
                     <child>
                       <object class="GtkImage" id="image4">
                         <property name="visible">1</property>
-                        <property name="icon_name">gtk-orientation-reverse-landscape</property>
-                        <property name="icon_size">3</property>
+                        <property name="icon-name">gtk-orientation-reverse-landscape</property>
+                        <property name="icon-size">3</property>
                       </object>
                     </child>
                     <child>
@@ -266,8 +266,8 @@
                 </child>
               </object>
               <packing>
-                <property name="left_attach">2</property>
-                <property name="top_attach">4</property>
+                <property name="left-attach">2</property>
+                <property name="top-attach">4</property>
               </packing>
             </child>
           </object>
diff --git a/gtk/ui/gtkpathbar.ui b/gtk/ui/gtkpathbar.ui
index b295065f58..b9fefc72fe 100644
--- a/gtk/ui/gtkpathbar.ui
+++ b/gtk/ui/gtkpathbar.ui
@@ -3,9 +3,9 @@
   <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkButton" id="down_slider_button">
     <property name="visible">1</property>
-    <property name="can_focus">1</property>
-    <property name="receives_default">1</property>
-    <property name="focus_on_click">0</property>
+    <property name="can-focus">1</property>
+    <property name="receives-default">1</property>
+    <property name="focus-on-click">0</property>
     <child internal-child="accessible">
       <object class="AtkObject" id="down_slider_button-atkobject">
         <property name="AtkObject::accessible-name" translatable="yes">Down Path</property>
@@ -28,9 +28,9 @@
   </object>
   <object class="GtkButton" id="up_slider_button">
     <property name="visible">1</property>
-    <property name="can_focus">1</property>
-    <property name="receives_default">1</property>
-    <property name="focus_on_click">0</property>
+    <property name="can-focus">1</property>
+    <property name="receives-default">1</property>
+    <property name="focus-on-click">0</property>
     <child internal-child="accessible">
       <object class="AtkObject" id="up_slider_button-atkobject">
         <property name="AtkObject::accessible-name" translatable="yes">Up Path</property>
diff --git a/gtk/ui/gtkplacesview.ui b/gtk/ui/gtkplacesview.ui
index 09911baa24..53d193fcb2 100644
--- a/gtk/ui/gtkplacesview.ui
+++ b/gtk/ui/gtkplacesview.ui
@@ -11,25 +11,22 @@
   </object>
   <object class="GtkEntryCompletion" id="address_entry_completion">
     <property name="model">completion_store</property>
-    <property name="text_column">1</property>
-    <property name="inline_completion">1</property>
-    <property name="popup_completion">0</property>
+    <property name="text-column">1</property>
+    <property name="inline-completion">1</property>
+    <property name="popup-completion">0</property>
   </object>
   <object class="GtkPopover" id="server_adresses_popover">
-    <property name="can_focus">False</property>
-    <property name="relative_to">address_entry</property>
+    <property name="relative-to">address_entry</property>
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="border_width">12</property>
+        <property name="visible">1</property>
+        <property name="border-width">12</property>
         <property name="orientation">vertical</property>
         <property name="spacing">12</property>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="hexpand">True</property>
+            <property name="visible">1</property>
+            <property name="hexpand">1</property>
             <property name="label" translatable="yes">Server Addresses</property>
             <attributes>
               <attribute name="weight" value="bold"/>
@@ -38,44 +35,34 @@
               <class name="dim-label"/>
             </style>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="hexpand">True</property>
+            <property name="visible">1</property>
+            <property name="hexpand">1</property>
             <property name="label" translatable="yes">Server addresses are made up of a protocol prefix and an address. Examples:
 
 smb://foo.example.com, ssh://192.168.0.1</property>
-            <property name="wrap">True</property>
-            <property name="width_chars">40</property>
-            <property name="max_width_chars">40</property>
+            <property name="wrap">1</property>
+            <property name="width-chars">40</property>
+            <property name="max-width-chars">40</property>
             <property name="xalign">0</property>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkGrid">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="margin_top">6</property>
-            <property name="hexpand">True</property>
-            <property name="row_spacing">6</property>
-            <property name="column_spacing">12</property>
+            <property name="visible">1</property>
+            <property name="margin-top">6</property>
+            <property name="hexpand">1</property>
+            <property name="row-spacing">6</property>
+            <property name="column-spacing">12</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
+                <property name="visible">1</property>
+                <property name="hexpand">1</property>
                 <property name="label" translatable="yes">Available Protocols</property>
                 <property name="xalign">0</property>
                 <attributes>
@@ -83,86 +70,79 @@ smb://foo.example.com, ssh://192.168.0.1</property>
                 </attributes>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
+                <property name="left-attach">0</property>
+                <property name="top-attach">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="visible">1</property>
                 <property name="label" translatable="yes">AppleTalk</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
+                <property name="left-attach">0</property>
+                <property name="top-attach">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="visible">1</property>
                 <property name="label" translatable="yes">File Transfer Protocol</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">2</property>
+                <property name="left-attach">0</property>
+                <property name="top-attach">2</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="visible">1</property>
                 <property name="label" translatable="yes">Samba</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">3</property>
+                <property name="left-attach">0</property>
+                <property name="top-attach">3</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="visible">1</property>
                 <property name="label" translatable="yes">Secure File Transfer Protocol</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">4</property>
+                <property name="left-attach">0</property>
+                <property name="top-attach">4</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="visible">1</property>
                 <property name="label" translatable="yes">Secure Shell</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">5</property>
+                <property name="left-attach">0</property>
+                <property name="top-attach">5</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="visible">1</property>
                 <property name="label" translatable="yes">WebDav</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">6</property>
+                <property name="left-attach">0</property>
+                <property name="top-attach">6</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="visible">1</property>
                 <property name="label" translatable="yes">Prefix</property>
                 <property name="xalign">0</property>
                 <attributes>
@@ -170,86 +150,78 @@ smb://foo.example.com, ssh://192.168.0.1</property>
                 </attributes>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="visible">1</property>
                 <property name="label">afp://</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="visible">1</property>
                 <property name="label">ftp://</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">2</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="visible">1</property>
                 <property name="label">smb://</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">3</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">3</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="visible">1</property>
                 <property name="label">sftp://</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">4</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">4</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="visible">1</property>
                 <property name="label">ssh://</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">5</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">5</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="visible">1</property>
                 <property name="label" translatable="yes" comments="Translators: do not translate http:// and https://">http:// or https://</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">6</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">6</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
             <property name="position">2</property>
           </packing>
         </child>
@@ -271,7 +243,7 @@ smb://foo.example.com, ssh://192.168.0.1</property>
               <object class="GtkImage">
                 <property name="visible">1</property>
                 <property name="pixel-size">48</property>
-                <property name="icon_name">network-server-symbolic</property>
+                <property name="icon-name">network-server-symbolic</property>
                 <style>
                   <class name="dim-label"/>
                 </style>
@@ -297,7 +269,7 @@ smb://foo.example.com, ssh://192.168.0.1</property>
         <child>
           <object class="GtkBox">
             <property name="visible">1</property>
-            <property name="border_width">12</property>
+            <property name="border-width">12</property>
             <property name="orientation">vertical</property>
             <property name="spacing">12</property>
             <child>
@@ -312,20 +284,20 @@ smb://foo.example.com, ssh://192.168.0.1</property>
             <child>
               <object class="GtkScrolledWindow">
                 <property name="visible">1</property>
-                <property name="can_focus">1</property>
+                <property name="can-focus">1</property>
                 <property name="vexpand">1</property>
-                <property name="shadow_type">in</property>
-                <property name="min_content_width">250</property>
-                <property name="min_content_height">200</property>
+                <property name="shadow-type">in</property>
+                <property name="min-content-width">250</property>
+                <property name="min-content-height">200</property>
                 <child>
                   <object class="GtkViewport">
                     <property name="visible">1</property>
-                    <property name="shadow_type">none</property>
+                    <property name="shadow-type">none</property>
                     <child>
                       <object class="GtkListBox" id="recent_servers_listbox">
                         <property name="visible">1</property>
-                        <property name="can_focus">1</property>
-                        <property name="selection_mode">none</property>
+                        <property name="can-focus">1</property>
+                        <property name="selection-mode">none</property>
                         <signal name="row-activated" handler="on_recent_servers_listbox_row_activated" object="GtkPlacesView" swapped="yes"/>
                       </object>
                     </child>
@@ -346,18 +318,18 @@ smb://foo.example.com, ssh://192.168.0.1</property>
   </object>
   <template class="GtkPlacesView" parent="GtkBox">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <property name="orientation">vertical</property>
     <signal name="key-press-event" handler="on_key_press_event" object="GtkPlacesView" swapped="no"/>
     <child>
       <object class="GtkStack" id="stack">
         <property name="visible">1</property>
         <property name="vhomogeneous">0</property>
-        <property name="transition_type">crossfade</property>
+        <property name="transition-type">crossfade</property>
         <child>
           <object class="GtkFrame">
             <property name="visible">1</property>
-            <property name="shadow_type">none</property>
+            <property name="shadow-type">none</property>
             <child>
               <object class="GtkScrolledWindow">
                 <property name="visible">1</property>
@@ -366,12 +338,12 @@ smb://foo.example.com, ssh://192.168.0.1</property>
                 <child>
                   <object class="GtkViewport">
                     <property name="visible">1</property>
-                    <property name="shadow_type">none</property>
+                    <property name="shadow-type">none</property>
                     <child>
                       <object class="GtkListBox" id="listbox">
                         <property name="visible">1</property>
-                        <property name="can_focus">1</property>
-                        <property name="selection_mode">none</property>
+                        <property name="can-focus">1</property>
+                        <property name="selection-mode">none</property>
                         <signal name="row-activated" handler="on_listbox_row_activated" object="GtkPlacesView" swapped="yes"/>
                       </object>
                     </child>
@@ -396,8 +368,8 @@ smb://foo.example.com, ssh://192.168.0.1</property>
             <child>
               <object class="GtkImage">
                 <property name="visible">1</property>
-                <property name="pixel_size">72</property>
-                <property name="icon_name">edit-find-symbolic</property>
+                <property name="pixel-size">72</property>
+                <property name="icon-name">edit-find-symbolic</property>
                 <style>
                   <class name="dim-label"/>
                 </style>
@@ -453,8 +425,8 @@ smb://foo.example.com, ssh://192.168.0.1</property>
             <property name="hexpand">1</property>
             <property name="xalign">0</property>
             <property name="label" translatable="yes">Connect to _Server</property>
-            <property name="mnemonic_widget">address_entry</property>
-            <property name="use_underline">1</property>
+            <property name="mnemonic-widget">address_entry</property>
+            <property name="use-underline">1</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -463,16 +435,16 @@ smb://foo.example.com, ssh://192.168.0.1</property>
         <child>
           <object class="GtkButton" id="connect_button">
             <property name="label" translatable="yes">Con_nect</property>
-            <property name="use_underline">1</property>
+            <property name="use-underline">1</property>
             <property name="visible">1</property>
-            <property name="can_focus">1</property>
+            <property name="can-focus">1</property>
             <property name="sensitive">0</property>
-            <property name="receives_default">1</property>
+            <property name="receives-default">1</property>
             <property name="valign">center</property>
             <signal name="clicked" handler="on_connect_button_clicked" object="GtkPlacesView" swapped="yes"/>
           </object>
           <packing>
-            <property name="pack_type">end</property>
+            <property name="pack-type">end</property>
           </packing>
         </child>
         <child>
@@ -482,11 +454,11 @@ smb://foo.example.com, ssh://192.168.0.1</property>
             <child>
               <object class="GtkEntry" id="address_entry">
                 <property name="visible">1</property>
-                <property name="can_focus">1</property>
+                <property name="can-focus">1</property>
                 <property name="hexpand">1</property>
-                <property name="width_chars">20</property>
-                <property name="placeholder_text" translatable="yes">Enter server address…</property>
-                <property name="secondary_icon_name" translatable="yes">dialog-question-symbolic</property>
+                <property name="width-chars">20</property>
+                <property name="placeholder-text" translatable="yes">Enter server address…</property>
+                <property name="secondary-icon-name" translatable="yes">dialog-question-symbolic</property>
                 <property name="completion">address_entry_completion</property>
                 <signal name="notify::text" handler="on_address_entry_text_changed" object="GtkPlacesView" swapped="yes"/>
                 <signal name="activate" handler="on_connect_button_clicked" object="GtkPlacesView" swapped="yes"/>
@@ -496,8 +468,8 @@ smb://foo.example.com, ssh://192.168.0.1</property>
             <child>
               <object class="GtkMenuButton" id="server_list_button">
                 <property name="visible">1</property>
-                <property name="can_focus">1</property>
-                <property name="receives_default">1</property>
+                <property name="can-focus">1</property>
+                <property name="receives-default">1</property>
                 <property name="direction">up</property>
                 <property name="popover">recent_servers_popover</property>
                 <style>
@@ -506,7 +478,7 @@ smb://foo.example.com, ssh://192.168.0.1</property>
                 <child>
                   <object class="GtkImage">
                     <property name="visible">1</property>
-                    <property name="icon_name">pan-down-symbolic</property>
+                    <property name="icon-name">pan-down-symbolic</property>
                   </object>
                 </child>
               </object>
@@ -516,7 +488,7 @@ smb://foo.example.com, ssh://192.168.0.1</property>
             </style>
           </object>
           <packing>
-            <property name="pack_type">end</property>
+            <property name="pack-type">end</property>
           </packing>
         </child>
       </object>
diff --git a/gtk/ui/gtkplacesviewrow.ui b/gtk/ui/gtkplacesviewrow.ui
index 89c840416d..e39aa0a99e 100644
--- a/gtk/ui/gtkplacesviewrow.ui
+++ b/gtk/ui/gtkplacesviewrow.ui
@@ -2,24 +2,24 @@
 <interface domain="gtk30">
   <requires lib="gtk+" version="3.16"/>
   <template class="GtkPlacesViewRow" parent="GtkListBoxRow">
-    <property name="width_request">100</property>
+    <property name="width-request">100</property>
     <property name="visible">True</property>
-    <property name="can_focus">True</property>
+    <property name="can-focus">True</property>
     <child>
       <object class="GtkEventBox" id="event_box">
         <property name="visible">1</property>
         <child>
           <object class="GtkBox" id="box">
             <property name="visible">1</property>
-            <property name="margin_start">12</property>
-            <property name="margin_end">12</property>
-            <property name="margin_top">6</property>
-            <property name="margin_bottom">6</property>
+            <property name="margin-start">12</property>
+            <property name="margin-end">12</property>
+            <property name="margin-top">6</property>
+            <property name="margin-bottom">6</property>
             <property name="spacing">18</property>
             <child>
               <object class="GtkImage" id="icon_image">
                 <property name="visible">1</property>
-                <property name="pixel_size">32</property>
+                <property name="pixel-size">32</property>
               </object>
             </child>
             <child>
@@ -35,10 +35,9 @@
             </child>
             <child>
               <object class="GtkLabel" id="available_space_label">
-                <property name="visible">False</property>
                 <property name="xalign">1</property>
                 <style>
-                  <class name="dim-label" />
+                  <class name="dim-label"/>
                 </style>
               </object>
               <packing>
@@ -51,7 +50,7 @@
                 <property name="justify">right</property>
                 <property name="ellipsize">middle</property>
                 <property name="xalign">0</property>
-                <property name="max_width_chars">15</property>
+                <property name="max-width-chars">15</property>
                 <style>
                   <class name="dim-label"/>
                 </style>
@@ -62,15 +61,15 @@
             </child>
             <child>
               <object class="GtkButton" id="eject_button">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="halign">end</property>
                 <property name="valign">center</property>
                 <property name="tooltip-text" translatable="yes">Unmount</property>
                 <child>
                   <object class="GtkImage" id="eject_icon">
                     <property name="visible">1</property>
-                    <property name="icon_name">media-eject-symbolic</property>
-                    <property name="icon_size">1</property>
+                    <property name="icon-name">media-eject-symbolic</property>
+                    <property name="icon-size">1</property>
                   </object>
                 </child>
                 <style>
diff --git a/gtk/ui/gtkprintunixdialog.ui b/gtk/ui/gtkprintunixdialog.ui
index 6e758b7d41..d0494b7997 100644
--- a/gtk/ui/gtkprintunixdialog.ui
+++ b/gtk/ui/gtkprintunixdialog.ui
@@ -6,7 +6,7 @@
     <property name="lower">1</property>
     <property name="upper">999</property>
     <property name="value">1</property>
-    <property name="step_increment">1</property>
+    <property name="step-increment">1</property>
   </object>
   <object class="GtkListStore" id="custom_paper_list">
     <columns>
@@ -39,23 +39,22 @@
     </columns>
   </object>
   <object class="GtkTreeModelFilter" id="printer_list_filter">
-    <property name="child_model">printer_list</property>
+    <property name="child-model">printer_list</property>
   </object>
   <object class="GtkAdjustment" id="scale_spin_adjustment">
     <property name="lower">1</property>
     <property name="upper">1000</property>
     <property name="value">100</property>
-    <property name="step_increment">1</property>
+    <property name="step-increment">1</property>
   </object>
   <template class="GtkPrintUnixDialog" parent="GtkDialog">
-    <property name="can_focus">False</property>
-    <property name="type_hint">dialog</property>
+    <property name="can-focus">False</property>
+    <property name="type-hint">dialog</property>
     <signal name="notify::page-setup" handler="redraw_page_layout_preview" swapped="no"/>
     <signal name="response" handler="error_dialogs" swapped="no"/>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="orientation">vertical</property>
-        <property name="border_width">0</property>
         <property name="spacing">2</property>
         <style>
           <class name="view"/>
@@ -67,12 +66,12 @@
             <child>
               <object class="GtkNotebook" id="notebook">
                 <property name="visible">1</property>
-                <property name="can_focus">1</property>
-                <property name="show_border">0</property>
+                <property name="can-focus">1</property>
+                <property name="show-border">0</property>
                 <child>
                   <object class="GtkBox" id="general_main_box">
                     <property name="visible">1</property>
-                    <property name="border_width">12</property>
+                    <property name="border-width">12</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">18</property>
                     <child>
@@ -83,12 +82,12 @@
                         <child>
                           <object class="GtkScrolledWindow" id="printer_swin">
                             <property name="visible">1</property>
-                            <property name="can_focus">1</property>
-                            <property name="shadow_type">in</property>
+                            <property name="can-focus">1</property>
+                            <property name="shadow-type">in</property>
                             <child>
                               <object class="GtkTreeView" id="printer_treeview">
                                 <property name="visible">1</property>
-                                <property name="can_focus">1</property>
+                                <property name="can-focus">1</property>
                                 <property name="model">printer_list_filter</property>
                                 <signal name="row-activated" handler="emit_ok_response" swapped="no"/>
                                 <child internal-child="selection">
@@ -193,21 +192,21 @@
                             <child>
                               <object class="GtkGrid" id="range_table">
                                 <property name="visible">1</property>
-                                <property name="margin_start">12</property>
-                                <property name="row_spacing">6</property>
-                                <property name="column_spacing">12</property>
+                                <property name="margin-start">12</property>
+                                <property name="row-spacing">6</property>
+                                <property name="column-spacing">12</property>
                                 <child>
                                   <object class="GtkRadioButton" id="all_pages_radio">
                                     <property name="label" translatable="yes">_All Pages</property>
                                     <property name="visible">1</property>
-                                    <property name="can_focus">1</property>
-                                    <property name="use_underline">1</property>
+                                    <property name="can-focus">1</property>
+                                    <property name="use-underline">1</property>
                                     <property name="active">1</property>
-                                    <property name="draw_indicator">1</property>
+                                    <property name="draw-indicator">1</property>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">0</property>
+                                    <property name="left-attach">0</property>
+                                    <property name="top-attach">0</property>
                                     <property name="width">2</property>
                                   </packing>
                                 </child>
@@ -216,15 +215,15 @@
                                     <property name="label" translatable="yes">C_urrent Page</property>
                                     <property name="visible">1</property>
                                     <property name="sensitive">0</property>
-                                    <property name="can_focus">1</property>
-                                    <property name="use_underline">1</property>
+                                    <property name="can-focus">1</property>
+                                    <property name="use-underline">1</property>
                                     <property name="active">1</property>
-                                    <property name="draw_indicator">1</property>
+                                    <property name="draw-indicator">1</property>
                                     <property name="group">all_pages_radio</property>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">1</property>
+                                    <property name="left-attach">0</property>
+                                    <property name="top-attach">1</property>
                                     <property name="width">2</property>
                                   </packing>
                                 </child>
@@ -232,15 +231,15 @@
                                   <object class="GtkRadioButton" id="selection_radio">
                                     <property name="label" translatable="yes">Se_lection</property>
                                     <property name="sensitive">0</property>
-                                    <property name="can_focus">1</property>
-                                    <property name="use_underline">1</property>
+                                    <property name="can-focus">1</property>
+                                    <property name="use-underline">1</property>
                                     <property name="active">1</property>
-                                    <property name="draw_indicator">1</property>
+                                    <property name="draw-indicator">1</property>
                                     <property name="group">all_pages_radio</property>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">2</property>
+                                    <property name="left-attach">0</property>
+                                    <property name="top-attach">2</property>
                                     <property name="width">2</property>
                                   </packing>
                                 </child>
@@ -248,29 +247,29 @@
                                   <object class="GtkRadioButton" id="page_range_radio">
                                     <property name="label" translatable="yes">Pag_es:</property>
                                     <property name="visible">1</property>
-                                    <property name="can_focus">1</property>
-                                    <property name="tooltip_text" translatable="yes">Specify one or more page ranges,
+                                    <property name="can-focus">1</property>
+                                    <property name="tooltip-text" translatable="yes">Specify one or more page ranges,
  e.g. 1–3, 7, 11</property>
-                                    <property name="use_underline">1</property>
+                                    <property name="use-underline">1</property>
                                     <property name="active">1</property>
-                                    <property name="draw_indicator">1</property>
+                                    <property name="draw-indicator">1</property>
                                     <property name="group">all_pages_radio</property>
                                     <signal name="toggled" handler="update_page_range_entry_sensitivity" swapped="no"/>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">3</property>
+                                    <property name="left-attach">0</property>
+                                    <property name="top-attach">3</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkEntry" id="page_range_entry">
                                     <property name="visible">1</property>
                                     <property name="sensitive">0</property>
-                                    <property name="can_focus">1</property>
-                                    <property name="tooltip_text" translatable="yes">Specify one or more page ranges,
+                                    <property name="can-focus">1</property>
+                                    <property name="tooltip-text" translatable="yes">Specify one or more page ranges,
  e.g. 1–3, 7, 11</property>
-                                    <property name="invisible_char">•</property>
-                                    <property name="activates_default">1</property>
+                                    <property name="invisible-char">•</property>
+                                    <property name="activates-default">1</property>
                                     <child internal-child="accessible">
                                       <object class="AtkObject" id="page_range_entry-atkobject">
                                         <property name="AtkObject::accessible-name" translatable="yes">Pages</property>
@@ -280,8 +279,8 @@
                                     </child>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">3</property>
+                                    <property name="left-attach">1</property>
+                                    <property name="top-attach">3</property>
                                   </packing>
                                 </child>
                                 <accessibility>
@@ -323,77 +322,77 @@
                             <child>
                               <object class="GtkGrid" id="grid1">
                                 <property name="visible">1</property>
-                                <property name="margin_start">12</property>
-                                <property name="row_spacing">6</property>
-                                <property name="column_spacing">12</property>
+                                <property name="margin-start">12</property>
+                                <property name="row-spacing">6</property>
+                                <property name="column-spacing">12</property>
                                 <child>
                                   <object class="GtkLabel" id="label4">
                                     <property name="visible">1</property>
                                     <property name="halign">start</property>
                                     <property name="valign">baseline</property>
                                     <property name="label" translatable="yes">Copie_s:</property>
-                                    <property name="use_underline">1</property>
-                                    <property name="mnemonic_widget">copies_spin</property>
+                                    <property name="use-underline">1</property>
+                                    <property name="mnemonic-widget">copies_spin</property>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">0</property>
+                                    <property name="left-attach">0</property>
+                                    <property name="top-attach">0</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkSpinButton" id="copies_spin">
                                     <property name="visible">1</property>
-                                    <property name="can_focus">1</property>
+                                    <property name="can-focus">1</property>
                                     <property name="valign">baseline</property>
-                                    <property name="invisible_char">•</property>
-                                    <property name="activates_default">1</property>
+                                    <property name="invisible-char">•</property>
+                                    <property name="activates-default">1</property>
                                     <property name="adjustment">copies_spin_adjustment</property>
                                     <signal name="changed" handler="update_dialog_from_capabilities" object="GtkPrintUnixDialog" swapped="yes"/>
                                     <signal name="value-changed" handler="update_dialog_from_capabilities" object="GtkPrintUnixDialog" swapped="yes"/>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">0</property>
+                                    <property name="left-attach">1</property>
+                                    <property name="top-attach">0</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="collate_check">
                                     <property name="label" translatable="yes">C_ollate</property>
                                     <property name="visible">1</property>
-                                    <property name="can_focus">1</property>
-                                    <property name="use_underline">1</property>
-                                    <property name="draw_indicator">1</property>
+                                    <property name="can-focus">1</property>
+                                    <property name="use-underline">1</property>
+                                    <property name="draw-indicator">1</property>
                                     <signal name="toggled" handler="update_collate_icon" swapped="no"/>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">1</property>
+                                    <property name="left-attach">0</property>
+                                    <property name="top-attach">1</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="reverse_check">
                                     <property name="label" translatable="yes">_Reverse</property>
                                     <property name="visible">1</property>
-                                    <property name="can_focus">1</property>
-                                    <property name="use_underline">1</property>
-                                    <property name="draw_indicator">1</property>
+                                    <property name="can-focus">1</property>
+                                    <property name="use-underline">1</property>
+                                    <property name="draw-indicator">1</property>
                                     <signal name="toggled" handler="update_collate_icon" swapped="no"/>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">2</property>
+                                    <property name="left-attach">0</property>
+                                    <property name="top-attach">2</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkDrawingArea" id="collate_image">
-                                    <property name="width_request">70</property>
-                                    <property name="height_request">90</property>
+                                    <property name="width-request">70</property>
+                                    <property name="height-request">90</property>
                                     <property name="visible">1</property>
                                     <signal name="draw" handler="draw_collate_cb" swapped="no"/>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">1</property>
+                                    <property name="left-attach">1</property>
+                                    <property name="top-attach">1</property>
                                     <property name="height">2</property>
                                   </packing>
                                 </child>
@@ -426,13 +425,13 @@
                     <property name="label" translatable="yes">General</property>
                   </object>
                   <packing>
-                    <property name="tab_fill">0</property>
+                    <property name="tab-fill">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkBox" id="page_setup_main_box">
                     <property name="visible">1</property>
-                    <property name="border_width">12</property>
+                    <property name="border-width">12</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">18</property>
                     <child>
@@ -464,32 +463,32 @@
                             <child>
                               <object class="GtkGrid" id="grid2">
                                 <property name="visible">1</property>
-                                <property name="margin_start">12</property>
-                                <property name="row_spacing">6</property>
-                                <property name="column_spacing">12</property>
+                                <property name="margin-start">12</property>
+                                <property name="row-spacing">6</property>
+                                <property name="column-spacing">12</property>
                                 <child>
                                   <object class="GtkLabel" id="label5">
                                     <property name="visible">1</property>
                                     <property name="halign">start</property>
                                     <property name="valign">baseline</property>
                                     <property name="label" translatable="yes">T_wo-sided:</property>
-                                    <property name="use_underline">1</property>
-                                    <property name="mnemonic_widget">duplex</property>
+                                    <property name="use-underline">1</property>
+                                    <property name="mnemonic-widget">duplex</property>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">0</property>
+                                    <property name="left-attach">0</property>
+                                    <property name="top-attach">0</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkPrinterOptionWidget" id="duplex">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
+                                    <property name="can-focus">False</property>
                                     <property name="valign">baseline</property>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">0</property>
+                                    <property name="left-attach">1</property>
+                                    <property name="top-attach">0</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -498,25 +497,25 @@
                                     <property name="halign">start</property>
                                     <property name="valign">baseline</property>
                                     <property name="label" translatable="yes">Pages per _side:</property>
-                                    <property name="use_underline">1</property>
-                                    <property name="mnemonic_widget">pages_per_sheet</property>
+                                    <property name="use-underline">1</property>
+                                    <property name="mnemonic-widget">pages_per_sheet</property>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">1</property>
+                                    <property name="left-attach">0</property>
+                                    <property name="top-attach">1</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkPrinterOptionWidget" id="pages_per_sheet">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
+                                    <property name="can-focus">False</property>
                                     <property name="valign">baseline</property>
                                     <signal name="changed" handler="redraw_page_layout_preview" object="GtkPrintUnixDialog" swapped="yes"/>
                                     <signal name="changed" handler="update_number_up_layout" object="GtkPrintUnixDialog" swapped="yes"/>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">1</property>
+                                    <property name="left-attach">1</property>
+                                    <property name="top-attach">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -525,24 +524,24 @@
                                     <property name="halign">start</property>
                                     <property name="valign">baseline</property>
                                     <property name="label" translatable="yes">Page or_dering:</property>
-                                    <property name="use_underline">1</property>
-                                    <property name="mnemonic_widget">number_up_layout</property>
+                                    <property name="use-underline">1</property>
+                                    <property name="mnemonic-widget">number_up_layout</property>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">2</property>
+                                    <property name="left-attach">0</property>
+                                    <property name="top-attach">2</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkPrinterOptionWidget" id="number_up_layout">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
+                                    <property name="can-focus">False</property>
                                     <property name="valign">baseline</property>
                                     <signal name="changed" handler="redraw_page_layout_preview" object="GtkPrintUnixDialog" swapped="yes"/>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">2</property>
+                                    <property name="left-attach">1</property>
+                                    <property name="top-attach">2</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -551,12 +550,12 @@
                                     <property name="halign">start</property>
                                     <property name="valign">baseline</property>
                                     <property name="label" translatable="yes">_Only print:</property>
-                                    <property name="use_underline">1</property>
-                                    <property name="mnemonic_widget">page_set_combo</property>
+                                    <property name="use-underline">1</property>
+                                    <property name="mnemonic-widget">page_set_combo</property>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">3</property>
+                                    <property name="left-attach">0</property>
+                                    <property name="top-attach">3</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -564,8 +563,8 @@
                                     <property name="visible">1</property>
                                     <property name="valign">baseline</property>
                                     <property name="active">0</property>
-                                    <property name="entry_text_column">0</property>
-                                    <property name="id_column">1</property>
+                                    <property name="entry-text-column">0</property>
+                                    <property name="id-column">1</property>
                                     <items>
                                       <item translatable="yes">All sheets</item>
                                       <item translatable="yes">Even sheets</item>
@@ -573,8 +572,8 @@
                                     </items>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">3</property>
+                                    <property name="left-attach">1</property>
+                                    <property name="top-attach">3</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -583,12 +582,12 @@
                                     <property name="halign">start</property>
                                     <property name="valign">baseline</property>
                                     <property name="label" translatable="yes">Sc_ale:</property>
-                                    <property name="use_underline">1</property>
-                                    <property name="mnemonic_widget">scale_spin</property>
+                                    <property name="use-underline">1</property>
+                                    <property name="mnemonic-widget">scale_spin</property>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">4</property>
+                                    <property name="left-attach">0</property>
+                                    <property name="top-attach">4</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -600,8 +599,8 @@
                                       <object class="GtkSpinButton" id="scale_spin">
                                         <property name="visible">1</property>
                                         <property name="valign">baseline</property>
-                                        <property name="can_focus">1</property>
-                                        <property name="invisible_char">•</property>
+                                        <property name="can-focus">1</property>
+                                        <property name="invisible-char">•</property>
                                         <property name="adjustment">scale_spin_adjustment</property>
                                         <property name="digits">1</property>
                                       </object>
@@ -618,8 +617,8 @@
                                     </child>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">4</property>
+                                    <property name="left-attach">1</property>
+                                    <property name="top-attach">4</property>
                                   </packing>
                                 </child>
                                 <accessibility>
@@ -661,32 +660,32 @@
                             <child>
                               <object class="GtkGrid" id="grid3">
                                 <property name="visible">1</property>
-                                <property name="margin_start">12</property>
-                                <property name="row_spacing">6</property>
-                                <property name="column_spacing">12</property>
+                                <property name="margin-start">12</property>
+                                <property name="row-spacing">6</property>
+                                <property name="column-spacing">12</property>
                                 <child>
                                   <object class="GtkLabel" id="label11">
                                     <property name="visible">1</property>
                                     <property name="halign">start</property>
                                     <property name="valign">baseline</property>
                                     <property name="label" translatable="yes">Paper _type:</property>
-                                    <property name="use_underline">1</property>
-                                    <property name="mnemonic_widget">paper_type</property>
+                                    <property name="use-underline">1</property>
+                                    <property name="mnemonic-widget">paper_type</property>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">0</property>
+                                    <property name="left-attach">0</property>
+                                    <property name="top-attach">0</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkPrinterOptionWidget" id="paper_type">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
+                                    <property name="can-focus">False</property>
                                     <property name="valign">baseline</property>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">0</property>
+                                    <property name="left-attach">1</property>
+                                    <property name="top-attach">0</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -695,23 +694,23 @@
                                     <property name="halign">start</property>
                                     <property name="valign">baseline</property>
                                     <property name="label" translatable="yes">Paper _source:</property>
-                                    <property name="use_underline">1</property>
-                                    <property name="mnemonic_widget">paper_source</property>
+                                    <property name="use-underline">1</property>
+                                    <property name="mnemonic-widget">paper_source</property>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">1</property>
+                                    <property name="left-attach">0</property>
+                                    <property name="top-attach">1</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkPrinterOptionWidget" id="paper_source">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
+                                    <property name="can-focus">False</property>
                                     <property name="valign">baseline</property>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">1</property>
+                                    <property name="left-attach">1</property>
+                                    <property name="top-attach">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -720,23 +719,23 @@
                                     <property name="halign">start</property>
                                     <property name="valign">baseline</property>
                                     <property name="label" translatable="yes">Output t_ray:</property>
-                                    <property name="use_underline">1</property>
-                                    <property name="mnemonic_widget">output_tray</property>
+                                    <property name="use-underline">1</property>
+                                    <property name="mnemonic-widget">output_tray</property>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">2</property>
+                                    <property name="left-attach">0</property>
+                                    <property name="top-attach">2</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkPrinterOptionWidget" id="output_tray">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
+                                    <property name="can-focus">False</property>
                                     <property name="valign">baseline</property>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">2</property>
+                                    <property name="left-attach">1</property>
+                                    <property name="top-attach">2</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -745,12 +744,12 @@
                                     <property name="halign">start</property>
                                     <property name="valign">baseline</property>
                                     <property name="label" translatable="yes">_Paper size:</property>
-                                    <property name="use_underline">1</property>
-                                    <property name="mnemonic_widget">paper_size_combo</property>
+                                    <property name="use-underline">1</property>
+                                    <property name="mnemonic-widget">paper_size_combo</property>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">3</property>
+                                    <property name="left-attach">0</property>
+                                    <property name="top-attach">3</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -764,8 +763,8 @@
                                     </child>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">3</property>
+                                    <property name="left-attach">1</property>
+                                    <property name="top-attach">3</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -774,12 +773,12 @@
                                     <property name="halign">start</property>
                                     <property name="valign">baseline</property>
                                     <property name="label" translatable="yes">Or_ientation:</property>
-                                    <property name="use_underline">1</property>
-                                    <property name="mnemonic_widget">orientation_combo</property>
+                                    <property name="use-underline">1</property>
+                                    <property name="mnemonic-widget">orientation_combo</property>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">4</property>
+                                    <property name="left-attach">0</property>
+                                    <property name="top-attach">4</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -787,9 +786,9 @@
                                     <property name="visible">1</property>
                                     <property name="sensitive">0</property>
                                     <property name="active">0</property>
-                                    <property name="entry_text_column">0</property>
+                                    <property name="entry-text-column">0</property>
                                     <property name="valign">baseline</property>
-                                    <property name="id_column">1</property>
+                                    <property name="id-column">1</property>
                                     <items>
                                       <item translatable="yes">Portrait</item>
                                       <item translatable="yes">Landscape</item>
@@ -798,8 +797,8 @@
                                     </items>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">4</property>
+                                    <property name="left-attach">1</property>
+                                    <property name="top-attach">4</property>
                                   </packing>
                                 </child>
                                 <accessibility>
@@ -828,8 +827,8 @@
                         <property name="visible">1</property>
                         <child>
                           <object class="GtkDrawingArea" id="page_layout_preview">
-                            <property name="width_request">320</property>
-                            <property name="height_request">160</property>
+                            <property name="width-request">320</property>
+                            <property name="height-request">160</property>
                             <property name="visible">1</property>
                             <signal name="draw" handler="draw_page_cb" swapped="no"/>
                           </object>
@@ -855,14 +854,14 @@
                   </object>
                   <packing>
                     <property name="position">1</property>
-                    <property name="tab_fill">0</property>
+                    <property name="tab-fill">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkGrid" id="job_page">
-                    <property name="border_width">12</property>
-                    <property name="row_spacing">18</property>
-                    <property name="column_spacing">18</property>
+                    <property name="border-width">12</property>
+                    <property name="row-spacing">18</property>
+                    <property name="column-spacing">18</property>
                     <child>
                       <object class="GtkBox" id="frame_template5">
                         <property name="visible">1</property>
@@ -888,31 +887,31 @@
                         <child>
                           <object class="GtkGrid" id="grid5">
                             <property name="visible">1</property>
-                            <property name="margin_start">12</property>
-                            <property name="row_spacing">6</property>
-                            <property name="column_spacing">12</property>
+                            <property name="margin-start">12</property>
+                            <property name="row-spacing">6</property>
+                            <property name="column-spacing">12</property>
                             <child>
                               <object class="GtkLabel" id="label16">
                                 <property name="visible">1</property>
                                 <property name="halign">start</property>
                                 <property name="valign">center</property>
                                 <property name="label" translatable="yes">Pri_ority:</property>
-                                <property name="use_underline">1</property>
-                                <property name="mnemonic_widget">job_prio</property>
+                                <property name="use-underline">1</property>
+                                <property name="mnemonic-widget">job_prio</property>
                               </object>
                               <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">0</property>
+                                <property name="left-attach">0</property>
+                                <property name="top-attach">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkPrinterOptionWidget" id="job_prio">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                               </object>
                               <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">0</property>
+                                <property name="left-attach">1</property>
+                                <property name="top-attach">0</property>
                               </packing>
                             </child>
                             <child>
@@ -921,22 +920,22 @@
                                 <property name="halign">start</property>
                                 <property name="valign">center</property>
                                 <property name="label" translatable="yes">_Billing info:</property>
-                                <property name="use_underline">1</property>
-                                <property name="mnemonic_widget">billing_info</property>
+                                <property name="use-underline">1</property>
+                                <property name="mnemonic-widget">billing_info</property>
                               </object>
                               <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">1</property>
+                                <property name="left-attach">0</property>
+                                <property name="top-attach">1</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkPrinterOptionWidget" id="billing_info">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                               </object>
                               <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">1</property>
+                                <property name="left-attach">1</property>
+                                <property name="top-attach">1</property>
                               </packing>
                             </child>
                             <accessibility>
@@ -950,8 +949,8 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">0</property>
                       </packing>
                     </child>
                     <child>
@@ -979,22 +978,22 @@
                         <child>
                           <object class="GtkGrid" id="grid6">
                             <property name="visible">1</property>
-                            <property name="margin_start">12</property>
-                            <property name="row_spacing">6</property>
-                            <property name="column_spacing">12</property>
+                            <property name="margin-start">12</property>
+                            <property name="row-spacing">6</property>
+                            <property name="column-spacing">12</property>
                             <child>
                               <object class="GtkRadioButton" id="print_now_radio">
                                 <property name="label" translatable="yes" comments="this is one of the choices for the print at option in the print dialog">_Now</property>
                                 <property name="visible">1</property>
-                                <property name="can_focus">1</property>
-                                <property name="use_underline">1</property>
+                                <property name="can-focus">1</property>
+                                <property name="use-underline">1</property>
                                 <property name="active">1</property>
-                                <property name="draw_indicator">1</property>
+                                <property name="draw-indicator">1</property>
                                 <signal name="toggled" handler="update_print_at_option" object="GtkPrintUnixDialog" swapped="yes"/>
                               </object>
                               <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">0</property>
+                                <property name="left-attach">0</property>
+                                <property name="top-attach">0</property>
                                 <property name="width">2</property>
                               </packing>
                             </child>
@@ -1002,35 +1001,35 @@
                               <object class="GtkRadioButton" id="print_at_radio">
                                 <property name="label" translatable="yes" comments="this is one of the choices for the print at option in the print dialog. It also serves as the label for an entry that allows the user to enter a time.">A_t:</property>
                                 <property name="visible">1</property>
-                                <property name="can_focus">1</property>
-                                <property name="has_tooltip">1</property>
-                                <property name="tooltip_markup" translatable="yes">Specify the time of print,
+                                <property name="can-focus">1</property>
+                                <property name="has-tooltip">1</property>
+                                <property name="tooltip-markup" translatable="yes">Specify the time of print,
  e.g. 15∶30, 2∶35 pm, 14∶15∶20, 11∶46∶30 am, 4 pm</property>
-                                <property name="tooltip_text" translatable="yes" comments="Ability to parse the am/pm format depends on actual locale. You can remove the am/pm values below for your locale if they are not supported.">Specify the time of print,
+                                <property name="tooltip-text" translatable="yes" comments="Ability to parse the am/pm format depends on actual locale. You can remove the am/pm values below for your locale if they are not supported.">Specify the time of print,
  e.g. 15∶30, 2∶35 pm, 14∶15∶20, 11∶46∶30 am, 4 pm</property>
-                                <property name="use_underline">1</property>
-                                <property name="draw_indicator">1</property>
+                                <property name="use-underline">1</property>
+                                <property name="draw-indicator">1</property>
                                 <property name="group">print_now_radio</property>
                                 <signal name="toggled" handler="update_print_at_entry_sensitivity" swapped="no"/>
                                 <signal name="toggled" handler="update_print_at_option" object="GtkPrintUnixDialog" swapped="yes"/>
                               </object>
                               <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">1</property>
+                                <property name="left-attach">0</property>
+                                <property name="top-attach">1</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkEntry" id="print_at_entry">
                                 <property name="visible">1</property>
                                 <property name="sensitive">0</property>
-                                <property name="can_focus">1</property>
-                                <property name="has_tooltip">1</property>
-                                <property name="tooltip_markup" translatable="yes">Specify the time of print,
+                                <property name="can-focus">1</property>
+                                <property name="has-tooltip">1</property>
+                                <property name="tooltip-markup" translatable="yes">Specify the time of print,
  e.g. 15∶30, 2∶35 pm, 14∶15∶20, 11∶46∶30 am, 4 pm</property>
-                                <property name="tooltip_text" translatable="yes" comments="Ability to parse the am/pm format depends on actual locale. You can remove the am/pm values below for your locale if they are not supported.">Specify the time of print,
+                                <property name="tooltip-text" translatable="yes" comments="Ability to parse the am/pm format depends on actual locale. You can remove the am/pm values below for your locale if they are not supported.">Specify the time of print,
  e.g. 15∶30, 2∶35 pm, 14∶15∶20, 11∶46∶30 am, 4 pm</property>
-                                <property name="invisible_char">•</property>
-                                <property name="invisible_char_set">1</property>
+                                <property name="invisible-char">•</property>
+                                <property name="invisible-char-set">1</property>
                                 <child internal-child="accessible">
                                   <object class="AtkObject" id="print_at_entry-atkobject">
                                     <property name="AtkObject::accessible-name" translatable="yes">Time of print</property>
@@ -1041,26 +1040,26 @@
                                 <signal name="changed" handler="update_print_at_option" object="GtkPrintUnixDialog" swapped="yes"/>
                               </object>
                               <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">1</property>
+                                <property name="left-attach">1</property>
+                                <property name="top-attach">1</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="print_hold_radio">
                                 <property name="label" translatable="yes" comments="this is one of the choices for the print at option in the print dialog. It means that the print job will not be printed until it explicitly gets &apos;released&apos;.">On _hold</property>
                                 <property name="visible">1</property>
-                                <property name="can_focus">1</property>
-                                <property name="has_tooltip">1</property>
-                                <property name="tooltip_markup" translatable="yes">Hold the job until it is explicitly released</property>
-                                <property name="tooltip_text" translatable="yes">Hold the job until it is explicitly released</property>
-                                <property name="use_underline">1</property>
-                                <property name="draw_indicator">1</property>
+                                <property name="can-focus">1</property>
+                                <property name="has-tooltip">1</property>
+                                <property name="tooltip-markup" translatable="yes">Hold the job until it is explicitly released</property>
+                                <property name="tooltip-text" translatable="yes">Hold the job until it is explicitly released</property>
+                                <property name="use-underline">1</property>
+                                <property name="draw-indicator">1</property>
                                 <property name="group">print_now_radio</property>
                                 <signal name="toggled" handler="update_print_at_option" object="GtkPrintUnixDialog" swapped="yes"/>
                               </object>
                               <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">2</property>
+                                <property name="left-attach">0</property>
+                                <property name="top-attach">2</property>
                                 <property name="width">2</property>
                               </packing>
                             </child>
@@ -1075,8 +1074,8 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">1</property>
                       </packing>
                     </child>
                     <child>
@@ -1104,31 +1103,31 @@
                         <child>
                           <object class="GtkGrid" id="grid7">
                             <property name="visible">1</property>
-                            <property name="margin_start">12</property>
-                            <property name="row_spacing">6</property>
-                            <property name="column_spacing">12</property>
+                            <property name="margin-start">12</property>
+                            <property name="row-spacing">6</property>
+                            <property name="column-spacing">12</property>
                             <child>
                               <object class="GtkLabel" id="label18">
                                 <property name="visible">1</property>
                                 <property name="halign">start</property>
                                 <property name="valign">center</property>
                                 <property name="label" translatable="yes" comments="this is the label used for the option in the print dialog that controls the front cover page.">Be_fore:</property>
-                                <property name="use_underline">1</property>
-                                <property name="mnemonic_widget">cover_before</property>
+                                <property name="use-underline">1</property>
+                                <property name="mnemonic-widget">cover_before</property>
                               </object>
                               <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">0</property>
+                                <property name="left-attach">0</property>
+                                <property name="top-attach">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkPrinterOptionWidget" id="cover_before">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                               </object>
                               <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">0</property>
+                                <property name="left-attach">1</property>
+                                <property name="top-attach">0</property>
                               </packing>
                             </child>
                             <child>
@@ -1137,22 +1136,22 @@
                                 <property name="halign">start</property>
                                 <property name="valign">center</property>
                                 <property name="label" translatable="yes" comments="this is the label used for the option in the print dialog that controls the back cover page.">_After:</property>
-                                <property name="use_underline">1</property>
-                                <property name="mnemonic_widget">cover_after</property>
+                                <property name="use-underline">1</property>
+                                <property name="mnemonic-widget">cover_after</property>
                               </object>
                               <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">1</property>
+                                <property name="left-attach">0</property>
+                                <property name="top-attach">1</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkPrinterOptionWidget" id="cover_after">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                               </object>
                               <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">1</property>
+                                <property name="left-attach">1</property>
+                                <property name="top-attach">1</property>
                               </packing>
                             </child>
                             <accessibility>
@@ -1166,8 +1165,8 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
+                        <property name="left-attach">1</property>
+                        <property name="top-attach">0</property>
                       </packing>
                     </child>
                   </object>
@@ -1182,23 +1181,23 @@
                   </object>
                   <packing>
                     <property name="position">2</property>
-                    <property name="tab_fill">0</property>
+                    <property name="tab-fill">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkScrolledWindow" id="image_quality_page">
-                    <property name="can_focus">1</property>
-                    <property name="hscrollbar_policy">never</property>
+                    <property name="can-focus">1</property>
+                    <property name="hscrollbar-policy">never</property>
                     <child>
                       <object class="GtkViewport" id="viewport1">
                         <property name="visible">1</property>
-                        <property name="shadow_type">none</property>
+                        <property name="shadow-type">none</property>
                         <child>
                           <object class="GtkGrid" id="image_quality_table">
                             <property name="visible">1</property>
-                            <property name="border_width">12</property>
-                            <property name="row_spacing">6</property>
-                            <property name="column_spacing">12</property>
+                            <property name="border-width">12</property>
+                            <property name="row-spacing">6</property>
+                            <property name="column-spacing">12</property>
                           </object>
                         </child>
                       </object>
@@ -1215,23 +1214,23 @@
                   </object>
                   <packing>
                     <property name="position">3</property>
-                    <property name="tab_fill">0</property>
+                    <property name="tab-fill">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkScrolledWindow" id="color_page">
-                    <property name="can_focus">1</property>
-                    <property name="hscrollbar_policy">never</property>
+                    <property name="can-focus">1</property>
+                    <property name="hscrollbar-policy">never</property>
                     <child>
                       <object class="GtkViewport" id="viewport2">
                         <property name="visible">1</property>
-                        <property name="shadow_type">none</property>
+                        <property name="shadow-type">none</property>
                         <child>
                           <object class="GtkGrid" id="color_table">
                             <property name="visible">1</property>
-                            <property name="border_width">12</property>
-                            <property name="row_spacing">6</property>
-                            <property name="column_spacing">12</property>
+                            <property name="border-width">12</property>
+                            <property name="row-spacing">6</property>
+                            <property name="column-spacing">12</property>
                           </object>
                         </child>
                       </object>
@@ -1248,23 +1247,23 @@
                   </object>
                   <packing>
                     <property name="position">4</property>
-                    <property name="tab_fill">0</property>
+                    <property name="tab-fill">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkScrolledWindow" id="finishing_page">
-                    <property name="can_focus">1</property>
-                    <property name="hscrollbar_policy">never</property>
+                    <property name="can-focus">1</property>
+                    <property name="hscrollbar-policy">never</property>
                     <child>
                       <object class="GtkViewport" id="viewport3">
                         <property name="visible">1</property>
-                        <property name="shadow_type">none</property>
+                        <property name="shadow-type">none</property>
                         <child>
                           <object class="GtkGrid" id="finishing_table">
                             <property name="visible">1</property>
-                            <property name="border_width">12</property>
-                            <property name="row_spacing">6</property>
-                            <property name="column_spacing">12</property>
+                            <property name="border-width">12</property>
+                            <property name="row-spacing">6</property>
+                            <property name="column-spacing">12</property>
                           </object>
                         </child>
                       </object>
@@ -1281,21 +1280,21 @@
                   </object>
                   <packing>
                     <property name="position">5</property>
-                    <property name="tab_fill">0</property>
+                    <property name="tab-fill">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkScrolledWindow" id="advanced_page">
-                    <property name="can_focus">1</property>
-                    <property name="hscrollbar_policy">never</property>
+                    <property name="can-focus">1</property>
+                    <property name="hscrollbar-policy">never</property>
                     <child>
                       <object class="GtkViewport" id="viewport4">
                         <property name="visible">1</property>
-                        <property name="shadow_type">none</property>
+                        <property name="shadow-type">none</property>
                         <child>
                           <object class="GtkBox" id="advanced_vbox">
                             <property name="visible">1</property>
-                            <property name="border_width">12</property>
+                            <property name="border-width">12</property>
                             <property name="orientation">vertical</property>
                             <property name="spacing">18</property>
                           </object>
@@ -1314,7 +1313,7 @@
                   </object>
                   <packing>
                     <property name="position">6</property>
-                    <property name="tab_fill">0</property>
+                    <property name="tab-fill">0</property>
                   </packing>
                 </child>
               </object>
@@ -1327,8 +1326,8 @@
                 <child>
                   <object class="GtkImage" id="image1">
                     <property name="visible">1</property>
-                    <property name="icon_name">dialog-warning-symbolic</property>
-                    <property name="icon_size">1</property>
+                    <property name="icon-name">dialog-warning-symbolic</property>
+                    <property name="icon-size">1</property>
                   </object>
                 </child>
                 <child>
@@ -1340,7 +1339,7 @@
               </object>
               <packing>
                 <property name="fill">0</property>
-                <property name="pack_type">end</property>
+                <property name="pack-type">end</property>
                 <property name="position">1</property>
               </packing>
             </child>
diff --git a/gtk/ui/gtkrecentchooserdefault.ui b/gtk/ui/gtkrecentchooserdefault.ui
index 4a37598578..ef94199559 100644
--- a/gtk/ui/gtkrecentchooserdefault.ui
+++ b/gtk/ui/gtkrecentchooserdefault.ui
@@ -12,22 +12,22 @@
     </columns>
   </object>
   <template class="GtkRecentChooserDefault" parent="GtkBox">
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <property name="orientation">vertical</property>
     <property name="spacing">6</property>
     <child>
       <object class="GtkScrolledWindow" id="scrolledwindow">
         <property name="visible">1</property>
-        <property name="can_focus">1</property>
-        <property name="hscrollbar_policy">never</property>
-        <property name="shadow_type">in</property>
+        <property name="can-focus">1</property>
+        <property name="hscrollbar-policy">never</property>
+        <property name="shadow-type">in</property>
         <property name="vexpand">1</property>
         <child>
           <object class="GtkTreeView" id="recent_view">
             <property name="visible">1</property>
-            <property name="can_focus">1</property>
-            <property name="has_tooltip">1</property>
-            <property name="headers_visible">0</property>
+            <property name="can-focus">1</property>
+            <property name="has-tooltip">1</property>
+            <property name="headers-visible">0</property>
             <signal name="button-press-event" handler="recent_view_button_press_cb" swapped="no"/>
             <signal name="drag-begin" handler="recent_view_drag_begin_cb" swapped="no"/>
             <signal name="drag-data-get" handler="recent_view_drag_data_get_cb" swapped="no"/>
@@ -44,7 +44,7 @@
                 <property name="title">icon</property>
                 <child>
                   <object class="GtkCellRendererPixbuf" id="icon_renderer">
-                    <property name="stock_size">4</property>
+                    <property name="stock-size">4</property>
                   </object>
                 </child>
               </object>
@@ -75,15 +75,15 @@
         <child>
           <object class="GtkComboBoxText" id="filter_combo">
             <property name="visible">1</property>
-            <property name="tooltip_text" translatable="yes">Select which type of documents are shown</property>
-            <property name="focus_on_click">0</property>
-            <property name="entry_text_column">0</property>
-            <property name="id_column">1</property>
+            <property name="tooltip-text" translatable="yes">Select which type of documents are shown</property>
+            <property name="focus-on-click">0</property>
+            <property name="entry-text-column">0</property>
+            <property name="id-column">1</property>
             <signal name="changed" handler="filter_combo_changed_cb" swapped="no"/>
           </object>
           <packing>
             <property name="fill">0</property>
-            <property name="pack_type">end</property>
+            <property name="pack-type">end</property>
           </packing>
         </child>
       </object>
diff --git a/gtk/ui/gtkscalebutton.ui b/gtk/ui/gtkscalebutton.ui
index bea8bccdbe..44373ca3fb 100644
--- a/gtk/ui/gtkscalebutton.ui
+++ b/gtk/ui/gtkscalebutton.ui
@@ -3,22 +3,22 @@
   <!-- interface-requires gtk+ 3.10 -->
   <!-- interface-requires gtkprivate 3.10 -->
   <template class="GtkScaleButton" parent="GtkButton">
-    <property name="can_focus">1</property>
-    <property name="receives_default">1</property>
+    <property name="can-focus">1</property>
+    <property name="receives-default">1</property>
     <property name="relief">none</property>
-    <property name="focus_on_click">0</property>
+    <property name="focus-on-click">0</property>
     <child>
       <object class="GtkImage" id="image">
         <property name="visible">1</property>
-        <property name="icon_name">image-missing</property>
+        <property name="icon-name">image-missing</property>
         <property name="use-fallback">1</property>
       </object>
     </child>
   </template>
   <object class="GtkAdjustment" id="adjustment">
     <property name="upper">100</property>
-    <property name="step_increment">2</property>
-    <property name="page_increment">20</property>
+    <property name="step-increment">2</property>
+    <property name="page-increment">20</property>
   </object>
   <object class="GtkPopover" id="dock">
     <signal name="map" handler="cb_popup_mapped" swapped="no"/>
@@ -34,8 +34,8 @@
         <child>
           <object class="GtkButton" id="plus_button">
             <property name="visible">1</property>
-            <property name="can_focus">1</property>
-            <property name="receives_default">1</property>
+            <property name="can-focus">1</property>
+            <property name="receives-default">1</property>
             <property name="relief">none</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
@@ -59,14 +59,14 @@
         </child>
         <child>
           <object class="GtkScale" id="scale">
-            <property name="height_request">100</property>
+            <property name="height-request">100</property>
             <property name="visible">1</property>
-            <property name="can_focus">1</property>
+            <property name="can-focus">1</property>
             <property name="orientation">vertical</property>
             <property name="adjustment">adjustment</property>
             <property name="inverted">1</property>
-            <property name="round_digits">1</property>
-            <property name="draw_value">0</property>
+            <property name="round-digits">1</property>
+            <property name="draw-value">0</property>
             <signal name="value-changed" handler="cb_scale_value_changed" swapped="no"/>
           </object>
           <packing>
@@ -76,8 +76,8 @@
         <child>
           <object class="GtkButton" id="minus_button">
             <property name="visible">1</property>
-            <property name="can_focus">1</property>
-            <property name="receives_default">1</property>
+            <property name="can-focus">1</property>
+            <property name="receives-default">1</property>
             <property name="relief">none</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
diff --git a/gtk/ui/gtksearchbar.ui b/gtk/ui/gtksearchbar.ui
index 0d7197f395..070002001c 100644
--- a/gtk/ui/gtksearchbar.ui
+++ b/gtk/ui/gtksearchbar.ui
@@ -2,7 +2,7 @@
 <interface domain="gtk30">
   <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkSearchBar" parent="GtkBin">
-    <property name="app_paintable">1</property>
+    <property name="app-paintable">1</property>
     <child>
       <object class="GtkRevealer" id="revealer">
         <property name="visible">1</property>
@@ -10,7 +10,7 @@
         <child>
           <object class="GtkBox" id="tool_box">
             <property name="visible">1</property>
-            <property name="border_width">6</property>
+            <property name="border-width">6</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkBox" id="box_left">
@@ -42,8 +42,8 @@
                 <child>
                   <object class="GtkButton" id="close_button">
                     <property name="visible">1</property>
-                    <property name="can_focus">1</property>
-                    <property name="receives_default">1</property>
+                    <property name="can-focus">1</property>
+                    <property name="receives-default">1</property>
                     <property name="relief">none</property>
                     <style>
                       <class name="raised"/>
@@ -52,8 +52,8 @@
                     <child>
                       <object class="GtkImage" id="close_image">
                         <property name="visible">1</property>
-                        <property name="icon_size">1</property>
-                        <property name="icon_name">window-close-symbolic</property>
+                        <property name="icon-size">1</property>
+                        <property name="icon-name">window-close-symbolic</property>
                       </object>
                     </child>
                   </object>
diff --git a/gtk/ui/gtksidebarrow.ui b/gtk/ui/gtksidebarrow.ui
index 861979b717..f275cdfc28 100644
--- a/gtk/ui/gtksidebarrow.ui
+++ b/gtk/ui/gtksidebarrow.ui
@@ -49,8 +49,8 @@
                     <child>
                       <object class="GtkImage">
                         <property name="visible">1</property>
-                        <property name="icon_name">media-eject-symbolic</property>
-                        <property name="icon_size">1</property>
+                        <property name="icon-name">media-eject-symbolic</property>
+                        <property name="icon-size">1</property>
                       </object>
                     </child>
                     <style>
diff --git a/gtk/ui/gtkstatusbar.ui b/gtk/ui/gtkstatusbar.ui
index 8dbd537a7e..299705648d 100644
--- a/gtk/ui/gtkstatusbar.ui
+++ b/gtk/ui/gtkstatusbar.ui
@@ -3,14 +3,14 @@
   <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkStatusbar" parent="GtkBox">
     <property name="spacing">2</property>
-    <property name="margin_start">10</property>
-    <property name="margin_end">10</property>
-    <property name="margin_top">6</property>
-    <property name="margin_bottom">6</property>
+    <property name="margin-start">10</property>
+    <property name="margin-end">10</property>
+    <property name="margin-top">6</property>
+    <property name="margin-bottom">6</property>
     <child>
       <object class="GtkFrame" id="frame">
         <property name="visible">1</property>
-        <property name="shadow_type">none</property>
+        <property name="shadow-type">none</property>
         <child>
           <object class="GtkBox" id="message_area">
             <property name="visible">1</property>
@@ -22,7 +22,7 @@
                 <property name="halign">start</property>
                 <property name="valign">center</property>
                 <property name="ellipsize">end</property>
-                <property name="single_line_mode">1</property>
+                <property name="single-line-mode">1</property>
               </object>
             </child>
           </object>
diff --git a/gtk/ui/gtktooltipwindow.ui b/gtk/ui/gtktooltipwindow.ui
index 1cb2de0740..80965056c5 100644
--- a/gtk/ui/gtktooltipwindow.ui
+++ b/gtk/ui/gtktooltipwindow.ui
@@ -3,32 +3,27 @@
   <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkTooltipWindow" parent="GtkWindow">
     <property name="resizable">0</property>
-    <property name="type_hint">tooltip</property>
+    <property name="type-hint">tooltip</property>
     <child>
       <object class="GtkBox" id="box">
-        <property name="orientation">horizontal</property>
         <property name="visible">1</property>
         <property name="spacing">6</property>
-        <property name="margin_top">6</property>
-        <property name="margin_bottom">6</property>
-        <property name="margin_start">6</property>
-        <property name="margin_end">6</property>
+        <property name="margin-top">6</property>
+        <property name="margin-bottom">6</property>
+        <property name="margin-start">6</property>
+        <property name="margin-end">6</property>
         <child>
           <object class="GtkImage" id="image">
-            <property name="visible">0</property>
-            <property name="icon_name">image-missing</property>
+            <property name="icon-name">image-missing</property>
           </object>
           <packing>
             <property name="fill">0</property>
-            <property name="position">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label">
-            <property name="visible">0</property>
             <property name="wrap">1</property>
-            <property name="max_width_chars">70</property>
-            <property name="label"></property>
+            <property name="max-width-chars">70</property>
           </object>
           <packing>
             <property name="fill">0</property>
diff --git a/gtk/ui/gtkvolumebutton.ui b/gtk/ui/gtkvolumebutton.ui
index 16c7b4fddb..b2b99a1cc2 100644
--- a/gtk/ui/gtkvolumebutton.ui
+++ b/gtk/ui/gtkvolumebutton.ui
@@ -3,16 +3,16 @@
   <!-- interface-requires gtk+ 3.6 -->
   <object class="GtkAdjustment" id="adjustment">
     <property name="upper">1</property>
-    <property name="step_increment">0.02</property>
-    <property name="page_increment">0.2</property>
+    <property name="step-increment">0.02</property>
+    <property name="page-increment">0.2</property>
   </object>
   <template class="GtkVolumeButton" parent="GtkScaleButton">
     <property name="visible">1</property>
-    <property name="can_focus">1</property>
-    <property name="receives_default">1</property>
-    <property name="has_tooltip">1</property>
+    <property name="can-focus">1</property>
+    <property name="receives-default">1</property>
+    <property name="has-tooltip">1</property>
     <property name="relief">none</property>
-    <property name="focus_on_click">0</property>
+    <property name="focus-on-click">0</property>
     <property name="orientation">vertical</property>
     <property name="adjustment">adjustment</property>
     <property name="icons">audio-volume-muted
-- 
2.30.2